commit 374ba3fcff8c3fa6cd6f8f5b58ddcbdb96584d72
author Andrei-Valentin Onea <andreionea@google.com> Wed Feb 05 15:33:36 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 05 15:33:36 2020 +0000
tree ba251a0c36be320a7a5d84e8ae68e0a0a0cb347a
parent bb83c298e0b7c9675eccb1b7b4b9f6be6cbc90ab
parent 7c8130368282d97289fcbfbdbb28169824c718dc

Merge "Clear caller identity before calls to PlatformCompat"

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 2636586..28e44f1 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -4680,12 +4680,15 @@
 
     private void ensureMinimumQuality(
             int userId, ActiveAdmin admin, int minimumQuality, String operation) {
-        if (admin.mPasswordPolicy.quality < minimumQuality
-                && passwordQualityInvocationOrderCheckEnabled(admin.info.getPackageName(),
-                userId)) {
-            throw new IllegalStateException(String.format(
-                    "password quality should be at least %d for %s", minimumQuality, operation));
-        }
+        mInjector.binderWithCleanCallingIdentity(() -> {
+            if (admin.mPasswordPolicy.quality < minimumQuality
+                    && passwordQualityInvocationOrderCheckEnabled(admin.info.getPackageName(),
+                    userId)) {
+                throw new IllegalStateException(String.format(
+                        "password quality should be at least %d for %s",
+                        minimumQuality, operation));
+            }
+        });
     }
 
     @Override