Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a49895d authored by Martynas Petuška's avatar Martynas Petuška Committed by Android (Google) Code Review
Browse files

Merge "Fix appcompat usage for wipeData API"

parents 972280e2 1cfee793

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

+3 −1
Original line number Diff line number Diff line
@@ -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 {