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

Commit 85865d55 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Allow initializers to clear reset protection data during device setup. 

This allows initializers to recover from failures that occur after
it has added an account on the primary user.

Change-Id: I3444f16520eed4b315d6ea4761f598f55d1e6ddd
parent 78568bfa

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

+4 −1
Original line number Diff line number Diff line
@@ -3065,8 +3065,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            long ident = Binder.clearCallingIdentity();

            try {

                if ((flags & WIPE_RESET_PROTECTION_DATA) != 0) {

                    boolean ownsInitialization = isDeviceInitializer(admin.info.getPackageName())

                            && !hasUserSetupCompleted(userHandle);

                    if (userHandle != UserHandle.USER_OWNER

                            || !isDeviceOwner(admin.info.getPackageName())) {

                            || !(isDeviceOwner(admin.info.getPackageName())

                                    || ownsInitialization)) {

                        throw new SecurityException(

                               "Only device owner admins can set WIPE_RESET_PROTECTION_DATA");

                    }