am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master
* commit 'ccffea7a3d':
constify JNINativeMethod function pointer tables
This commit is contained in:
commit
26c330a424
1 changed files with 1 additions and 1 deletions
|
|
@ -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 },
|
||||
|
|
|
|||
Loading…
Reference in a new issue