drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When upgrading packages with shared user ids make sure we are eliminating

Browse Source 
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.

Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
This commit is contained in:
Suchi Amalapurapu
2009-10-28 23:39:46 -07:00
parent 31957f1bad
commit d83006cbe8
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/PackageManagerService.java
View File

@ -6344,7 +6344,9 @@ class PackageManagerService extends IPackageManager.Stub {
continue;
}
for (PackageSetting pkg:sus.packages) {
if (pkg.pkg.requestedPermissions.contains(eachPerm)) {
if (pkg.pkg != null &&
!pkg.pkg.packageName.equalsIgnoreCase(deletedPs.pkg.packageName) &&
pkg.pkg.requestedPermissions.contains(eachPerm)) {
used = true;
break;
}
@ -6359,7 +6361,9 @@ class PackageManagerService extends IPackageManager.Stub {
int newGids[] = globalGids;
for (String eachPerm : sus.grantedPermissions) {
BasePermission bp = mPermissions.get(eachPerm);
newGids = appendInts(newGids, bp.gids);
if (bp != null) {
newGids = appendInts(newGids, bp.gids);
}
}
sus.gids = newGids;
}