commit f0564c9ad5acdbe7d483332bc3fe2a602b63a4c4
author Greg Plesur <plesur@google.com> Fri Oct 07 16:52:44 2016 -0400
committer Koji Fukui <koji.fukui@sonymobile.com> Tue Dec 20 10:55:40 2016 +0900
tree bc918a98c123b4d5ca0f92d355c7a4b59c5e08b0
parent 6f1ce35f1991105d7031a8e210d39b15ac2278f7

Increase the timeout for dpm.removeActiveAdmin().

Some devices apparently need more time.  Our fastest devices need
~10.2 seconds, so I'm leaving room for our slowest devices.

BUG: 32019838

Change-Id: I680bcfe53f13625cf3b0e374188087b39ce499d7

hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/ClearDeviceAdminWithNoProtectionTest.java

diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/ClearDeviceAdminWithNoProtectionTest.java b/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/ClearDeviceAdminWithNoProtectionTest.java
index 3bfa905..7dd303f 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/ClearDeviceAdminWithNoProtectionTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/ClearDeviceAdminWithNoProtectionTest.java
@@ -33,7 +33,7 @@
 
         if (dpm.isAdminActive(cn)) {
             dpm.removeActiveAdmin(cn);
-            for (int i = 0; i < 1000 && dpm.isAdminActive(cn); i++) {
+            for (int i = 0; i < 6000 && dpm.isAdminActive(cn); i++) {
                 Thread.sleep(10);
             }
         }