From caee6ff9cb138e42c924ca4608c4552e4aef251a Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Tue, 2 Jun 2020 03:07:47 +0000 Subject: [PATCH] Fix TetheringManagerTest failure when using entitlement required SIM 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 Merged-In: I85299841d60afba97ffcc4ae908a85e51139319b Change-Id: I85299841d60afba97ffcc4ae908a85e51139319b --- .../android/tethering/cts/TetheringManagerTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java index 10555312f7..f7160dd502 100644 --- a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java +++ b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java @@ -286,8 +286,9 @@ public class TetheringManagerTest { assertTrue(tetheredIfaces.length == 0); final StartTetheringCallback startTetheringCallback = new StartTetheringCallback(); - mTM.startTethering(new TetheringRequest.Builder(TETHERING_WIFI).build(), - c -> c.run() /* executor */, startTetheringCallback); + final TetheringRequest request = new TetheringRequest.Builder(TETHERING_WIFI) + .setShouldShowEntitlementUi(false).build(); + mTM.startTethering(request, c -> c.run() /* executor */, startTetheringCallback); startTetheringCallback.verifyTetheringStarted(); mTetherChangeReceiver.expectTethering(true /* active */, wifiRegexs); @@ -529,8 +530,9 @@ public class TetheringManagerTest { assertFalse(isIfaceMatch(wifiRegexs, callback.getTetheredInterfaces())); final StartTetheringCallback startTetheringCallback = new StartTetheringCallback(); - mTM.startTethering(new TetheringRequest.Builder(TETHERING_WIFI).build(), - c -> c.run() /* executor */, startTetheringCallback); + final TetheringRequest request = new TetheringRequest.Builder(TETHERING_WIFI) + .setShouldShowEntitlementUi(false).build(); + mTM.startTethering(request, c -> c.run() /* executor */, startTetheringCallback); startTetheringCallback.verifyTetheringStarted(); callback.expectTetheredInterfacesChanged(wifiRegexs);