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

am 8b2cdcd1: Merge change 20037 into donut

Browse Source 
Merge commit '8b2cdcd184acfebfb245b15a71f5f1c32e53b050'

* commit '8b2cdcd184acfebfb245b15a71f5f1c32e53b050':
  fix issue with gids not being added for packages with shared user id
This commit is contained in:
Android (Google) Code Review
2009-08-05 15:45:34 -07:00
committed by Android Git Automerger
parent d41ba666d1 8b2cdcd184
commit b13f32c0a0
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2887,7 +2887,7 @@ class PackageManagerService extends IPackageManager.Stub {
if (gp.gids == null) {
gp.gids = mGlobalGids;
}
final int N = pkg.requestedPermissions.size();
for (int i=0; i<N; i++) {
String name = pkg.requestedPermissions.get(i);
@ -3758,7 +3758,7 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
}
private void updateSettingsLI(String pkgName, File tmpPackageFile,
String destFilePath, File destPackageFile,
File destResourceFile,
@ -4223,7 +4223,7 @@ class PackageManagerService extends IPackageManager.Stub {
synchronized (mPackages) {
if ( (deletedPs != null) && (deletedPs.sharedUser != null)) {
// remove permissions associated with package
mSettings.updateSharedUserPerms (deletedPs);
mSettings.updateSharedUserPermsLP(deletedPs, mGlobalGids);
}
// Save settings now
mSettings.writeLP ();
@ -6011,7 +6011,15 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
private void updateSharedUserPerms (PackageSetting deletedPs) {
/*
* Update the shared user setting when a package using
* specifying the shared user id is removed. The gids
* associated with each permission of the deleted package
* are removed from the shared user's gid list only if its
* not in use by other permissions of packages in the
* shared user setting.
*/
private void updateSharedUserPermsLP(PackageSetting deletedPs, int[] globalGids) {
if ( (deletedPs == null) || (deletedPs.pkg == null)) {
Log.i(TAG, "Trying to update info for null package. Just ignoring");
return;
@ -6040,13 +6048,14 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
// Update gids
int newGids[] = null;
for (PackageSetting pkg:sus.packages) {
newGids = appendInts(newGids, pkg.gids);
int newGids[] = globalGids;
for (String eachPerm : sus.grantedPermissions) {
BasePermission bp = mPermissions.get(eachPerm);
newGids = appendInts(newGids, bp.gids);
}
sus.gids = newGids;
}
private int removePackageLP(String name) {
PackageSetting p = mPackages.get(name);
if (p != null) {