diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-07 01:44:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-07 01:44:07 +0000 |
commit | 494e09f7ea7cfa94e86122febb00be33f3763d64 (patch) | |
tree | 704dd02344e88a8be6f9e8517ba45975874f370c | |
parent | 7f51280a158830e7b9f7a1f3636ee6650d7bba15 (diff) | |
parent | a5389ae7837be105dc58a181dc80d945948cd3d6 (diff) | |
download | cts-494e09f7ea7cfa94e86122febb00be33f3763d64.tar.gz |
Merge "fix testUserRestrictionsSetOnParentAreNotPersisted failure" into android11-tests-dev
-rw-r--r-- | hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java index a36bd006f2a..2263d6e5b68 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java @@ -114,7 +114,7 @@ public class UserRestrictionsParentTest extends InstrumentationTestCase { } public void testUserRestrictionDisallowConfigDateTimeIsNotPersisted() throws Exception { - final long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(30); + final long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(60); while (System.nanoTime() <= deadline) { if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_DATE_TIME)) { return; |