diff options
| author | 2022-11-17 16:39:41 +0000 | |
|---|---|---|
| committer | 2022-11-17 16:39:41 +0000 | |
| commit | 1cfee793fcf8b4280b494ab12cbb3e88eb783485 (patch) | |
| tree | 4cc0823eaf9c0a65879336b8cdfbfa0af7027a84 | |
| parent | a3d6ae1031e51bf8083f13ad8656f1fafafd2892 (diff) | |
Fix appcompat usage for wipeData API
Bug: b/259407605
Test: Invoke wipeData API via TestDPC with targetSdkVersion <33
Change-Id: I8684b112a7d06a633be4d5a416c8272be1730a84
| -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 89cbf5324ed4..57b06235237a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6880,7 +6880,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 { |