Merge \"Make sure we\'re locked\" into nyc-dev (092d9613) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -4764,10 +4764,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) {
		@@ -14485,7 +14483,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