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

Unit tests for new explicitlySelected behaviour.

Browse Source 
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.

While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.

Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b
This commit is contained in:
Lorenzo Colitti
2019-06-04 22:15:33 +09:00
parent 763d449493
commit f255e047b7
3 changed files with 83 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,15 +437,23 @@ public abstract class NetworkAgent extends Handler {
}
/**
* Called by the bearer to indicate this network was manually selected by the user.
* Called by the bearer to indicate whether the 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.
* Network can be given special treatment at that time.
*
* If {@code explicitlySelected} is {@code true}, and {@code acceptUnvalidated} is {@code true},
* then the system will switch to this network. If {@code explicitlySelected} is {@code true}
* and {@code acceptUnvalidated} 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 explicitlySelected}
* set to {@code true} and {@code acceptUnvalidated} set to {@code false}, it must also
* implement {@link #saveAcceptUnvalidated} to respect the user's choice.
*
* If {@code explicitlySelected} is {@code false} and {@code acceptUnvalidated} is
* {@code true}, the system will interpret this as the user having accepted partial connectivity
* on this network. Thus, the system will switch to the network and consider it validated even
* if it only provides partial connectivity, but the network is not otherwise treated specially.
*/
public void explicitlySelected(boolean explicitlySelected, boolean acceptUnvalidated) {
queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED,