am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

* commit 'd31db759cba78447ba1f4286a84c27a30a5aeb5c':
  Fix issue #9000597: PackageManager get NPE while running performance plan
This commit is contained in:
Dianne Hackborn
2013-05-17 13:34:30 -07:00
committed by Android Git Automerger

View File

@@ -8120,7 +8120,7 @@ public class PackageManagerService extends IPackageManager.Stub {
allUsers = sUserManager.getUserIds();
perUserInstalled = new boolean[allUsers.length];
for (int i = 0; i < allUsers.length; i++) {
perUserInstalled[i] = ps.getInstalled(allUsers[i]);
perUserInstalled[i] = ps != null ? ps.getInstalled(allUsers[i]) : false;
}
}
boolean sysPkg = (isSystemApp(oldPackage));
@@ -8689,7 +8689,7 @@ public class PackageManagerService extends IPackageManager.Stub {
allUsers = sUserManager.getUserIds();
perUserInstalled = new boolean[allUsers.length];
for (int i = 0; i < allUsers.length; i++) {
perUserInstalled[i] = ps.getInstalled(allUsers[i]);
perUserInstalled[i] = ps != null ? ps.getInstalled(allUsers[i]) : false;
}
}