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

Fix TetheringManagerTest failure when using entitlement required SIM

Browse Source 
If run tethering cts with entitlement required SIM, the test would
failure due to no tethering upstream. Tethering would default start
with UI base entitlement check which would have interfactive UI pop
up. Tethering's upstream is blocked because entitlement UI is keep
waiting for action till timeout.
To avoid UI interaction, start tethering with silent entitlement
check.

Bug: 156714671
Test: atest CtsTetheringTest
Change-Id: I85299841d60afba97ffcc4ae908a85e51139319b
This commit is contained in:
markchien
2020-05-27 23:22:27 +08:00
parent 47e3788e3e
commit f74fce0d0c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
View File

@@ -286,8 +286,9 @@ public class TetheringManagerTest {
assertTrue(tetheredIfaces.length == 0); assertTrue(tetheredIfaces.length == 0);
final StartTetheringCallback startTetheringCallback = new StartTetheringCallback(); final StartTetheringCallback startTetheringCallback = new StartTetheringCallback();
mTM.startTethering(new TetheringRequest.Builder(TETHERING_WIFI).build(), final TetheringRequest request = new TetheringRequest.Builder(TETHERING_WIFI)
c -> c.run() /* executor */, startTetheringCallback); .setShouldShowEntitlementUi(false).build();
mTM.startTethering(request, c -> c.run() /* executor */, startTetheringCallback);
startTetheringCallback.verifyTetheringStarted(); startTetheringCallback.verifyTetheringStarted();
mTetherChangeReceiver.expectTethering(true /* active */, wifiRegexs); mTetherChangeReceiver.expectTethering(true /* active */, wifiRegexs);
@@ -529,8 +530,9 @@ public class TetheringManagerTest {
assertFalse(isIfaceMatch(wifiRegexs, callback.getTetheredInterfaces())); assertFalse(isIfaceMatch(wifiRegexs, callback.getTetheredInterfaces()));
final StartTetheringCallback startTetheringCallback = new StartTetheringCallback(); final StartTetheringCallback startTetheringCallback = new StartTetheringCallback();
mTM.startTethering(new TetheringRequest.Builder(TETHERING_WIFI).build(), final TetheringRequest request = new TetheringRequest.Builder(TETHERING_WIFI)
c -> c.run() /* executor */, startTetheringCallback); .setShouldShowEntitlementUi(false).build();
mTM.startTethering(request, c -> c.run() /* executor */, startTetheringCallback);
startTetheringCallback.verifyTetheringStarted(); startTetheringCallback.verifyTetheringStarted();
callback.expectTetheredInterfacesChanged(wifiRegexs); callback.expectTetheredInterfacesChanged(wifiRegexs);