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

Commit 8e5ff556 authored by Jackal Guo's avatar Jackal Guo Committed by Automerger Merge Worker
Browse files

Merge "Enforce owner rights check to get/setMimeGroup" into sc-dev am: fe786600 

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

Change-Id: I45b82072b2f94b811d151dc70759e66fa473b619
parents 90cd5909 fe786600

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

+19 −9
Original line number Diff line number Diff line
@@ -23191,16 +23191,17 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) {

            return;

        }

        final String[] callerPackageNames = getPackagesForUid(callingUid);

        if (!ArrayUtils.contains(callerPackageNames, pkg)) {

            throw new SecurityException("Calling uid " + callingUid

                    + " does not own package " + pkg);

        }

        final int callingUserId = UserHandle.getUserId(callingUid);

        PackageInfo pi = getPackageInfo(pkg, 0, callingUserId);

        if (pi == null) {

            throw new IllegalArgumentException("Unknown package " + pkg + " on user "

                    + callingUserId);

        }

        if (!UserHandle.isSameApp(pi.applicationInfo.uid, callingUid)) {

            throw new SecurityException("Calling uid " + callingUid

                    + " does not own package " + pkg);

        }

    }















    @Override










@@ -27932,7 +27933,7 @@ public class PackageManagerService extends IPackageManager.Stub



























        @Override















        public List<String> getMimeGroup(String packageName, String mimeGroup) {













            return PackageManagerService.this.getMimeGroup(packageName, mimeGroup);













            return PackageManagerService.this.getMimeGroupInternal(packageName, mimeGroup);















        }





























        @Override










@@ -28558,9 +28559,11 @@ public class PackageManagerService extends IPackageManager.Stub



























    @Override















    public void setMimeGroup(String packageName, String mimeGroup, List<String> mimeTypes) {













        boolean changed = mSettings.getPackageLPr(packageName)













                .setMimeGroup(mimeGroup, mimeTypes);

























        enforceOwnerRights(packageName, Binder.getCallingUid());













        final boolean changed;













        synchronized (mLock) {













            changed = mSettings.getPackageLPr(packageName).setMimeGroup(mimeGroup, mimeTypes);













        }















        if (changed) {















            applyMimeGroupChanges(packageName, mimeGroup);















        }









@@ -28568,8 +28571,15 @@ public class PackageManagerService extends IPackageManager.Stub



























    @Override















    public List<String> getMimeGroup(String packageName, String mimeGroup) {













        enforceOwnerRights(packageName, Binder.getCallingUid());













        return getMimeGroupInternal(packageName, mimeGroup);













    }

























    private List<String> getMimeGroupInternal(String packageName, String mimeGroup) {













        synchronized (mLock) {















            return mSettings.getPackageLPr(packageName).getMimeGroup(mimeGroup);















        }













    }





























    @Override















    public void setSplashScreenTheme(@NonNull String packageName, @Nullable String themeId,