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

Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-04 18:00:31 +00:00
committed by Android (Google) Code Review
parent dee07f5d7f 0e33bd1167
commit e2fb127e41
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,7 +434,24 @@ 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 ? 1 : 0, 0);
explicitlySelected(true /* explicitlySelected */, acceptUnvalidated);
}
/**
* Called by the bearer to indicate this network was manually selected by the user.
* This should be called before the NetworkInfo is marked CONNECTED so that this
* Network can be given special treatment at that time. If {@code acceptUnvalidated} is
* {@code true}, then the system will switch to this network. If it is {@code false} and the
* network cannot be validated, the system will ask the user whether to switch to this network.
* If the user confirms and selects "don't ask again", then the system will call
* {@link #saveAcceptUnvalidated} to persist the user's choice. Thus, if the transport ever
* calls this method with {@code acceptUnvalidated} set to {@code false}, it must also implement
* {@link #saveAcceptUnvalidated} to respect the user's choice.
*/
public void explicitlySelected(boolean explicitlySelected, boolean acceptUnvalidated) {
queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED,
explicitlySelected ? 1 : 0,
acceptUnvalidated ? 1 : 0);
}
/**