am 830ed7c8: resolved conflicts for a884d81e to stage-aosp-master

* commit '830ed7c82f':
  constify JNINativeMethod function pointer tables
This commit is contained in:
Elliott Hughes 2015-09-24 17:14:10 +00:00 • committed by Android Git Automerger
commit 9653a1d4b1

View file

@ -302,7 +302,7 @@ static jboolean android_net_utils_queryUserAccess(JNIEnv *env, jobject thiz, jin
/*
* 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 },