commit 998a1baa9ca2d0e78cfc2f0b707cfed170b02830
author Elliott Hughes <enh@google.com> Thu Sep 24 17:23:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 24 17:23:00 2015 +0000
tree 83b57d1ac48029c220f6733746f0bfb7825ea86d
parent 0467b8e6372c71b97cddfc3ac591d947a5050e9f
parent 26c330a4248b79a14ac13c6ef30d522e4bba92d2

am 26c330a4: am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master

* commit '26c330a4248b79a14ac13c6ef30d522e4bba92d2':
  constify JNINativeMethod function pointer tables

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