commit c60969a5e558e7e645900d3586f8564ddc82fab3
author Lorenzo Colitti <lorenzo@google.com> Wed Oct 21 02:19:15 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 02:19:15 2015 +0000
tree 28ceda6d6365d1f83116f6738302a9cd84f4a4e1
parent f66c49e5b1b9dde59fbdcc652ab232f85773dcb0
parent 5d3203086bb3e636901325c7c6ba31cac8a4de55

Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49
am: 18ec0b5187

* commit '18ec0b518741dc5ac32c52ae9681efec3e73a23c':
  Don't buzz when automatically connecting to captive portals

core/jni/android_net_NetUtils.cpp

diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index fada7ac..ba0876d 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -302,7 +302,7 @@
 /*
  * JNI registration.
  */
-static JNINativeMethod gNetworkUtilMethods[] = {
+static const JNINativeMethod gNetworkUtilMethods[] = {
     /* name, signature, funcPtr */
     { "resetConnections", "(Ljava/lang/String;I)I",  (void *)android_net_utils_resetConnections },
     { "startDhcp", "(Ljava/lang/String;)Z",  (void *)android_net_utils_startDhcp },