Merge "Fix appcompat usage for wipeData API"

2022-11-18 10:28:37 +00:00
parent 972280e229 1cfee793fc
commit 6a49895d47
1 changed files with 3 additions and 1 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6894,7 +6894,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

            boolean isSystemUser = userId == UserHandle.USER_SYSTEM;
            boolean wipeDevice;
-            if (factoryReset == null || !CompatChanges.isChangeEnabled(EXPLICIT_WIPE_BEHAVIOUR)) {
+            if (factoryReset == null || !mInjector.isChangeEnabled(EXPLICIT_WIPE_BEHAVIOUR,
+                    admin.getPackageName(),
+                    userId)) {
                // Legacy mode
                wipeDevice = isSystemUser;
            } else {