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

Commit 2317451a authored by Makoto Onuki's avatar Makoto Onuki Committed by Suprabh Shukla
Browse files

DO NOT MERGE Do not call RecoverySystem with DPMS lock held 

Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.

Test: Manually tested wipeData() with ApiDemos, both on 1) the primary user,
2) a secondary user and 3) work profile.

Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests

Bug 30681079

Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ia832bed0f22396998d6307ab46e262dae9463838
(cherry picked from commit efdec8f5)
parent f98ed686

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

+34 −28
Original line number Diff line number Diff line
@@ -4536,7 +4536,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

    }



    private void wipeDataLocked(boolean wipeExtRequested, String reason) {

    private void wipeDataNoLock(boolean wipeExtRequested, String reason) {

        if (wipeExtRequested) {

            StorageManager sm = (StorageManager) mContext.getSystemService(

                    Context.STORAGE_SERVICE);
@@ -4556,13 +4556,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        final int userHandle = mInjector.userHandleGetCallingUserId();

        enforceFullCrossUsersPermission(userHandle);



        final String source;

        synchronized (this) {

            // This API can only be called by an active device admin,

            // so try to retrieve it to check that the caller is one.

            final ActiveAdmin admin = getActiveAdminForCallerLocked(null,

                    DeviceAdminInfo.USES_POLICY_WIPE_DATA);



            final String source = admin.info.getComponent().flattenToShortString();

            source = admin.info.getComponent().flattenToShortString();



            long ident = mInjector.binderClearCallingIdentity();

            try {
@@ -4577,18 +4578,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                        manager.wipe();

                    }

                }

                boolean wipeExtRequested = (flags & WIPE_EXTERNAL_STORAGE) != 0;

                wipeDeviceOrUserLocked(wipeExtRequested, userHandle,

                        "DevicePolicyManager.wipeData() from " + source);

            } finally {

                mInjector.binderRestoreCallingIdentity(ident);

            }

        }

        final boolean wipeExtRequested = (flags & WIPE_EXTERNAL_STORAGE) != 0;

        wipeDeviceNoLock(wipeExtRequested, userHandle,

                "DevicePolicyManager.wipeData() from " + source);

    }



    private void wipeDeviceOrUserLocked(boolean wipeExtRequested, final int userHandle, String reason) {

    private void wipeDeviceNoLock(boolean wipeExtRequested, final int userHandle, String reason) {

        final long ident = mInjector.binderClearCallingIdentity();

        try {

            if (userHandle == UserHandle.USER_SYSTEM) {

            wipeDataLocked(wipeExtRequested, reason);

                wipeDataNoLock(wipeExtRequested, reason);

            } else {

                mHandler.post(new Runnable() {

                    @Override
@@ -4611,6 +4614,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    }

                });

            }

        } finally {

            mInjector.binderRestoreCallingIdentity(ident);

        }

    }



    private void sendWipeProfileNotification() {
@@ -4789,7 +4795,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            }

            if (wipeData) {

                // Call without holding lock.

                wipeDeviceOrUserLocked(false, identifier,

                wipeDeviceNoLock(false, identifier,

                        "reportFailedPasswordAttempt()");

            }

        } finally {