diff options
| author | 2022-11-18 10:28:37 +0000 | |
|---|---|---|
| committer | 2022-11-18 10:28:37 +0000 | |
| commit | 6a49895d477ff88716f768d99d50b38caa6ffefa (patch) | |
| tree | 2dc18b4785841df7e3891d2837c1c4cdcb45810f | |
| parent | 972280e229d492df48e91c3b4412d826bed1e39e (diff) | |
| parent | 1cfee793fcf8b4280b494ab12cbb3e88eb783485 (diff) | |
Merge "Fix appcompat usage for wipeData API"
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c58e8d500eb2..53ded6961a25 100644 --- 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 { |