Merge "Make sure we're locked" into nyc-dev
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index a560c83..ada0a6b 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4753,10 +4753,8 @@
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) {
@@ -14478,7 +14476,9 @@
// Remove existing system package
removePackageLI(deletedPackage, true);
- disabledSystem = disableSystemPackageLPw(deletedPackage, pkg);
+ 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
