commit 017e0c060c659931859d3a63436000940c7c785e
author Sreeram Ramachandran <sreeram@google.com> Fri Nov 20 01:52:25 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 20 01:52:25 2015 +0000
tree bf6b47d5403ed2168b4a7b71348becb3231d5021
parent 550cc7cfd2e8f93c8cb6e59078ce9c16d93c912a
parent 26b435dfe18356867b9d460b628ce80de1c6b465

Don\'t use framework permission strings for netd permissions. am: 5c36486ea0 am: f51479864b am: e7267a355d am: d3b6e2d790 am: c987320b4a am: 992bfeab73 am: 26b435dfe1 am: 6d983179a0 am: 5d41bd8d1a am: c1552f0caf
am: 38a3b2154c

* commit '38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
  Don't use framework permission strings for netd permissions.

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