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

Commit 5574a061 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab 

am: e084a08f

Change-Id: I7cbdcd5d7e917fa290775260d3c30726948d4f4d
parents 75aee6f2 e084a08f

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

+5 −5
Original line number Diff line number Diff line
@@ -4770,10 +4770,8 @@ public class PackageManagerService extends IPackageManager.Stub { 
                final SharedUserSetting sus = (SharedUserSetting) obj;

                final int N = sus.packages.size();

                final String[] res = new String[N];

                final Iterator<PackageSetting> it = sus.packages.iterator();

                int i = 0;

                while (it.hasNext()) {

                    res[i++] = it.next().name;

                for (int i = 0; i < N; i++) {

                    res[i] = sus.packages.valueAt(i).name;

                }

                return res;

            } else if (obj instanceof PackageSetting) {
@@ -14491,7 +14489,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
        // Remove existing system package

        removePackageLI(deletedPackage, true);













        synchronized (mPackages) {















            disabledSystem = disableSystemPackageLPw(deletedPackage, pkg);













        }















        if (!disabledSystem) {















            // We didn't need to disable the .apk as a current system package,















            // which means we are replacing another update that is already