Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001, 2454760, 2454860, 2454838, 2454899, 2454970, 2455005, 2455027, 2454973, 2455006, 2455061, 2455007, 2454914, 2454987, 2454974] into oc-release

Change-Id: I82fb1e0ae2376a5bdcf5d3a451aaf10600f703ae

1 files changed, 3 insertions, 2 deletions

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 552503b6892..00b498af964 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 @@ public class BluetoothRestrictionTest extends BaseDeviceOwnerTest {
     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 @@ public class BluetoothRestrictionTest extends BaseDeviceOwnerTest {
     protected void tearDown() throws Exception {
         super.tearDown();
         mDevicePolicyManager.clearUserRestriction(getWho(), UserManager.DISALLOW_BLUETOOTH);
+        enable();
     }
 
     public void testEnableBluetoothFailsWhenDisallowed() throws Exception {
@@ -242,4 +243,4 @@ public class BluetoothRestrictionTest extends BaseDeviceOwnerTest {
         } catch (InterruptedException e) {}
     }
 
-}
\ No newline at end of file
+}