Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NetworkAgent: Send primitive integer in explicitlySelected"

Browse Source 
am: bf66847240

Change-Id: I8230dbb8416147a20fa202a578a8e07e4c601311
This commit is contained in:
Roshan Pius
2018-08-13 11:25:16 -07:00
committed by android-build-merger
parent f4e432ad76 bf66847240
commit 50a9fc9189
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.
*/
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.");
}
nai.networkMisc.explicitlySelected = true;
nai.networkMisc.acceptUnvalidated = (boolean) msg.obj;
nai.networkMisc.acceptUnvalidated = msg.arg1 == 1;
break;
}
case NetworkAgent.EVENT_PACKET_KEEPALIVE: {