LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for a884d81e to stage-aosp-master

Browse Source 
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
This commit is contained in:
Elliott Hughes
2015-09-24 10:01:32 -07:00
parent 5d87922526 b4dd27d4cf
commit 830ed7c82f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_net_NetUtils.cpp
View File

@@ -302,7 +302,7 @@ static jboolean android_net_utils_queryUserAccess(JNIEnv *env, jobject thiz, jin
/* /*
* JNI registration. * JNI registration.
*/ */
static JNINativeMethod gNetworkUtilMethods[] = { static const JNINativeMethod gNetworkUtilMethods[] = {
/* name, signature, funcPtr */ /* name, signature, funcPtr */
{ "resetConnections", "(Ljava/lang/String;I)I", (void *)android_net_utils_resetConnections }, { "resetConnections", "(Ljava/lang/String;I)I", (void *)android_net_utils_resetConnections },
{ "startDhcp", "(Ljava/lang/String;)Z", (void *)android_net_utils_startDhcp }, { "startDhcp", "(Ljava/lang/String;)Z", (void *)android_net_utils_startDhcp },