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

am fa30c0ee: Merge change 2548 into donut

Browse Source 
Merge commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d'

* commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d':
  Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id.
This commit is contained in:
Android (Google) Code Review
2009-06-01 10:22:35 -07:00
committed by The Android Open Source Project
parent 7c49790cde fa30c0eed3
commit b0d031ad13
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/widget/AppSecurityPermissions.java
View File

@@ -124,25 +124,25 @@ public class AppSecurityPermissions implements View.OnClickListener {
if(pkg == null) {
return;
}
// Extract shared user permissions if any
// Get requested permissions
if (pkg.requestedPermissions != null) {
ArrayList<String> strList = pkg.requestedPermissions;
int size = strList.size();
if (size > 0) {
extractPerms(strList.toArray(new String[size]), permSet);
}
}
// Get permissions related to shared user if any
if(pkg.mSharedUserId != null) {
int sharedUid;
try {
sharedUid = mPm.getUidForSharedUser(pkg.mSharedUserId);
getAllUsedPermissions(sharedUid, permSet);
} catch (NameNotFoundException e) {
Log.w(TAG, "Could'nt retrieve shared user id for:"+pkg.packageName);
return;
}
getAllUsedPermissions(sharedUid, permSet);
} else {
ArrayList<String> strList = pkg.requestedPermissions;
int size;
if((strList == null) || ((size = strList.size()) == 0)) {
return;
}
// Extract permissions defined in current package
extractPerms(strList.toArray(new String[size]), permSet);
}
// Retrieve list of permissions
for(PermissionInfo tmpInfo : permSet) {
mPermsList.add(tmpInfo);
}
@@ -176,14 +176,9 @@ public class AppSecurityPermissions implements View.OnClickListener {
Log.w(TAG, "Could'nt retrieve permissions for package:"+packageName);
return;
}
if(pkgInfo == null) {
return;
if ((pkgInfo != null) && (pkgInfo.requestedPermissions != null)) {
extractPerms(pkgInfo.requestedPermissions, permSet);
}
String strList[] = pkgInfo.requestedPermissions;
if(strList == null) {
return;
}
extractPerms(strList, permSet);
}
private void extractPerms(String strList[], Set<PermissionInfo> permSet) {