commit bde87a23f23b3904393adcaab1963ec0d4fd94f6
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Dec 14 11:23:38 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 14 11:23:38 2020 +0000
tree d6cbc8de8368f50cb621332733afc51c0090e565
parent 08c63c758d3695364d9012aabe88e15b015cb592
parent 7aee22e04e59be8a906f9c960960c0406c94fd51

Merge "Fix testPasswordMinimumRestrictions"

hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java
index 9874b75..79b7b2b 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java
@@ -51,8 +51,10 @@
         if (!mHasFeature || !mHasSecureLockScreen) {
             return;
         }
+        disableParentRestrictionChange();
         runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PasswordMinimumRestrictionsTest",
                 mProfileUserId);
+        enableParentRestrictionChange();
     }
 
     @FlakyTest
@@ -256,4 +258,14 @@
                         + "lockNow(FLAG_SECURE_USER_DATA)",
                 TIMEOUT_USER_LOCKED_MILLIS);
     }
+
+    private void disableParentRestrictionChange() throws Exception {
+        final String cmd = "am compat disable 165573442 " + MANAGED_PROFILE_PKG;
+        getDevice().executeShellCommand(cmd);
+    }
+
+    private void enableParentRestrictionChange() throws Exception {
+        final String cmd = "am compat enable 165573442 " + MANAGED_PROFILE_PKG;
+        getDevice().executeShellCommand(cmd);
+    }
 }