commit c41cfe3335d4f82952e056d6a961e7b9fb91bd95
author Lorenzo Colitti <lorenzo@google.com> Thu Oct 22 06:28:24 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 22 06:28:24 2015 +0000
tree bf6b47d5403ed2168b4a7b71348becb3231d5021
parent aea9258396724c9fc75247ce332aeaff6524cf6a
parent 91de63b074f0d940732cc052ca86ed449eadd519

Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a
am: bb8f652372

* commit 'bb8f652372f261edd2083103d4300a9173993706':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.

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 },