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

Commit 832267af authored by Todd Kennedy's avatar Todd Kennedy
Browse files

resolve merge conflicts of fc5c78e0 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic9e83a568e992ea1444bb321ca9dda2f7002e4aa
parents 27daeba3 fc5c78e0

services/core/java/com/android/server/pm/PackageManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.pm; 














import static android.Manifest.permission.DELETE_PACKAGES;















import static android.Manifest.permission.INSTALL_PACKAGES;













import static android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS;















import static android.Manifest.permission.READ_EXTERNAL_STORAGE;















import static android.Manifest.permission.REQUEST_DELETE_PACKAGES;















import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;










@@ -18421,6 +18422,14 @@ public class PackageManagerService extends IPackageManager.Stub













                callingUid == getPackageUid(mStorageManagerPackage, 0, callingUserId)) {















            return true;















        }

























        // Allow caller having MANAGE_PROFILE_AND_DEVICE_OWNERS permission to silently













        // uninstall for device owner provisioning.













        if (checkUidPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS, callingUid)













                == PERMISSION_GRANTED) {













            return true;













        }



























        return false;















    }