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

Merge "NetworkAgent: Send primitive integer in explicitlySelected" am: e6d745c6f8

Browse Source 
am: 50a9fc9189

Change-Id: I5c00ed2031433b1176e41a1c01fd80b90fe0d27c
This commit is contained in:
Roshan Pius
2018-08-13 15:37:07 -07:00
committed by android-build-merger
parent 98a4564880 e6d745c6f8
commit 71d14b08b2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/NetworkAgent.java
View File

@@ -387,7 +387,7 @@ public abstract class NetworkAgent extends Handler {
* {@link #saveAcceptUnvalidated} to respect the user's choice. * {@link #saveAcceptUnvalidated} to respect the user's choice.
*/ */
public void explicitlySelected(boolean acceptUnvalidated) { public void explicitlySelected(boolean acceptUnvalidated) {
queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED, acceptUnvalidated); queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED, acceptUnvalidated ? 1 : 0, 0);
} }
/** /**

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2202,7 +2202,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
loge("ERROR: already-connected network explicitly selected."); loge("ERROR: already-connected network explicitly selected.");
} }
nai.networkMisc.explicitlySelected = true; nai.networkMisc.explicitlySelected = true;
nai.networkMisc.acceptUnvalidated = (boolean) msg.obj; nai.networkMisc.acceptUnvalidated = msg.arg1 == 1;
break; break;
} }
case NetworkAgent.EVENT_PACKET_KEEPALIVE: { case NetworkAgent.EVENT_PACKET_KEEPALIVE: {