Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure we're locked" into nyc-dev

Browse Source
This commit is contained in:
Todd Kennedy
2016-06-16 16:22:53 +00:00
committed by Android (Google) Code Review
parent 6437205648 3d5604dc90
commit 32d67fab83
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4753,10 +4753,8 @@ public class PackageManagerService extends IPackageManager.Stub {
final SharedUserSetting sus = (SharedUserSetting) obj; final SharedUserSetting sus = (SharedUserSetting) obj;
final int N = sus.packages.size(); final int N = sus.packages.size();
final String[] res = new String[N]; final String[] res = new String[N];
final Iterator<PackageSetting> it = sus.packages.iterator(); for (int i = 0; i < N; i++) {
int i = 0; res[i] = sus.packages.valueAt(i).name;
while (it.hasNext()) {
res[i++] = it.next().name;
} }
return res; return res;
} else if (obj instanceof PackageSetting) { } else if (obj instanceof PackageSetting) {
@@ -14478,7 +14476,9 @@ public class PackageManagerService extends IPackageManager.Stub {
// Remove existing system package // Remove existing system package
removePackageLI(deletedPackage, true); removePackageLI(deletedPackage, true);
disabledSystem = disableSystemPackageLPw(deletedPackage, pkg); synchronized (mPackages) {
disabledSystem = disableSystemPackageLPw(deletedPackage, pkg);
}
if (!disabledSystem) { if (!disabledSystem) {
// We didn't need to disable the .apk as a current system package, // We didn't need to disable the .apk as a current system package,
// which means we are replacing another update that is already // which means we are replacing another update that is already