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 
am: 32d67fab83

Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b
This commit is contained in:
Todd Kennedy
2016-06-16 16:34:34 +00:00
committed by android-build-merger
parent 1e29965a85 32d67fab83
commit 092d961367
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

@@ -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);
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