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

Commit c3973058 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID... 

am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit 'b381d697':
  Ensure per package and per UID state share same package settings.
parents f4b8c343 b381d697

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

+15 −0
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ final class Settings { 
                p.sharedUser = origPackage.sharedUser;

                p.appId = origPackage.appId;

                p.origPackage = origPackage;

                p.getPermissionsState().copyFrom(origPackage.getPermissionsState());

                mRenamedPackages.put(name, origPackage.name);

                name = origPackage.name;

                // Update new package state.
@@ -815,6 +816,20 @@ final class Settings { 
            p.sharedUser = sharedUser;

            p.appId = sharedUser.userId;

        }



        // If the we know about this user id, we have to update it as it

        // has to point to the same PackageSetting instance as the package.

        Object userIdPs = getUserIdLPr(p.appId);

        if (sharedUser == null) {

            if (userIdPs != null && userIdPs != p) {

                replaceUserIdLPw(p.appId, p);

            }

        } else {

            if (userIdPs != null && userIdPs != sharedUser) {

                replaceUserIdLPw(p.appId, sharedUser);

            }

        }



        IntentFilterVerificationInfo ivi = mRestoredIntentFilterVerifications.get(name);

        if (ivi != null) {

            if (DEBUG_DOMAIN_VERIFICATION) {