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

Commit 164074f3 authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

Merge changes I64307527,Id230f8b1 into udc-dev am: 53026af5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22814557



Change-Id: I83c07b84be88685313206daedbca4086850428a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe47d538 53026af5

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -9599,6 +9599,7 @@ public class DevicePolicyManager { 
            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            } catch (IllegalArgumentException ex) {

                Log.e(TAG, "IllegalArgumentException checking isPackageSuspended", ex);

                throw new NameNotFoundException(packageName);

            }

        }

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

+14 −6
Original line number Diff line number Diff line
@@ -7515,6 +7515,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        boolean success = false;

        try {

            if (getCurrentForegroundUserId() == userId) {

                // TODO: We need to special case headless here as we can't switch to the system user

                mInjector.getIActivityManager().switchUser(UserHandle.USER_SYSTEM);

            }









@@ -7522,7 +7523,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













            if (!success) {















                Slogf.w(LOG_TAG, "Couldn't remove user " + userId);















            } else if (isManagedProfile(userId) && !wipeSilently) {













                sendWipeProfileNotification(wipeReasonForUser);













                sendWipeProfileNotification(wipeReasonForUser,













                        UserHandle.of(getProfileParentId(userId)));















            }















        } catch (RemoteException re) {















            // Shouldn't happen










@@ -7870,7 +7872,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        });















    }



























    private void sendWipeProfileNotification(String wipeReasonForUser) {













    private void sendWipeProfileNotification(String wipeReasonForUser, UserHandle user) {















        Notification notification =















                new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)















                        .setSmallIcon(android.R.drawable.stat_sys_warning)









@@ -7879,7 +7881,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                        .setColor(mContext.getColor(R.color.system_notification_accent_color))















                        .setStyle(new Notification.BigTextStyle().bigText(wipeReasonForUser))















                        .build();













        mInjector.getNotificationManager().notify(SystemMessage.NOTE_PROFILE_WIPED, notification);













        mInjector.getNotificationManager().notifyAsUser(













                /* tag= */ null, SystemMessage.NOTE_PROFILE_WIPED, notification, user);















    }





























    private String getWorkProfileDeletedTitle() {










@@ -13380,7 +13383,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













            throw new IllegalStateException("Feature flag is not enabled.");















        }















        if (isDeviceOwner(caller) || isProfileOwner(caller)) {













            throw new IllegalStateException("Admins are not allowed to call this API.");













            throw new SecurityException("Admins are not allowed to call this API.");















        }















        if (!mInjector.isChangeEnabled(















                ENABLE_COEXISTENCE_CHANGE, callerPackage, caller.getUserId())) {










@@ -16946,6 +16949,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    } else {















                        granted = PackageManager.PERMISSION_GRANTED;















                    }



























                }















            }















        }










@@ -20049,6 +20053,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        if (!mHasFeature) {















            return;















        }



























        Objects.requireNonNull(who, "ComponentName is null");















        Objects.requireNonNull(packageNames, "Package names is null");















        final CallerIdentity caller = getCallerIdentity(who);









@@ -20065,7 +20070,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













            saveSettingsLocked(caller.getUserId());















        }















        logSetCrossProfilePackages(who, packageNames);













        final CrossProfileApps crossProfileApps = mContext.getSystemService(CrossProfileApps.class);













        final CrossProfileApps crossProfileApps =













                mContext.createContextAsUser(













                        caller.getUserHandle(), /* flags= */ 0)













                        .getSystemService(CrossProfileApps.class);















        mInjector.binderWithCleanCallingIdentity(















        () -> crossProfileApps.resetInteractAcrossProfilesAppOps(















                        previousCrossProfilePackages, new HashSet<>(packageNames)));