Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix appcompat usage for wipeData API

Browse Source 
Bug: b/259407605
Test: Invoke wipeData API via TestDPC with targetSdkVersion <33
Change-Id: I8684b112a7d06a633be4d5a416c8272be1730a84
This commit is contained in:
Martynas Petuška
2022-11-17 16:39:41 +00:00
parent a3d6ae1031
commit 1cfee793fc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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 {