| commit | f5cbb3e592504dbaa7cafecf5fe27eaa6dc3757b | [log] [tgz] |
|---|---|---|
| author | Ross Yeh <rossyeh@google.com> | Wed Apr 10 16:53:43 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 10 16:53:43 2019 +0000 |
| tree | 71bf59a4c4933aa04f631c627ecbc84ceac2f35f | |
| parent | cf062cf6d1b0de969decd2a1728883a06f58e2f7 [diff] | |
| parent | 7dfae3498e4a0d42d3413dd46397117a24f6a930 [diff] |
Merge "DO NOT MERGE Fix for com.android.cts.devicepolicy.ManagedProfileTest#testCameraPolicy" into pie-cts-dev
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java index e092888..f20edcc 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java
@@ -41,8 +41,8 @@ ComponentName cn = PrimaryUserDeviceAdmin.ADMIN_RECEIVER_COMPONENT; if (mDpm.isAdminActive(cn)) { mDpm.removeActiveAdmin(cn); - // Wait until device admin is not active (with 2 minutes timeout). - for (int i = 0; i < 2 * 60 && mDpm.isAdminActive(cn); i++) { + // Wait until device admin is not active (with 5 minutes timeout). + for (int i = 0; i < 5 * 60 && mDpm.isAdminActive(cn); i++) { Thread.sleep(1000); // 1 second. } }