Fix BluetoothRestrictionTest flakiness.
Currently it often times out here.
+ enable bluetooth back in case the test left it turned off.
Bug: 62666981
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Change-Id: I63f24ee589751e4b77e096736f86c7f86aab5d45
(cherry picked from commit e5198bd9692bc81718d37845a71128620f5014a9)
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java
index 552503b..00b498a 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java
@@ -32,7 +32,7 @@
private static final int ENABLE_TIMEOUT_MS = 10000; // ms timeout for BT enable
private static final int POLL_TIME_MS = 400; // ms to poll BT state
private static final int CHECK_WAIT_TIME_MS = 1000; // ms to wait before enable/disable
- private static final int COMPONENT_STATE_TIMEOUT_MS = 2000;
+ private static final int COMPONENT_STATE_TIMEOUT_MS = 10000;
private static final ComponentName OPP_LAUNCHER_COMPONENT = new ComponentName(
"com.android.bluetooth", "com.android.bluetooth.opp.BluetoothOppLauncherActivity");
@@ -50,6 +50,7 @@
protected void tearDown() throws Exception {
super.tearDown();
mDevicePolicyManager.clearUserRestriction(getWho(), UserManager.DISALLOW_BLUETOOTH);
+ enable();
}
public void testEnableBluetoothFailsWhenDisallowed() throws Exception {
@@ -242,4 +243,4 @@
} catch (InterruptedException e) {}
}
-}
\ No newline at end of file
+}
