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

am d2cc888c: am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev

Browse Source 
* commit 'd2cc888cb9d5dbf87146ccd8fe02ea05121c02d8':
  doSignaturePermission -> grantSignaturePermission
This commit is contained in:
Nick Kralevich
2013-04-02 12:51:56 -07:00
committed by Android Git Automerger
parent f486361607 d2cc888cb9
commit bad8225336
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -5164,7 +5164,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// This permission is invalid; skip it.
allowed = false;
} else if (level == PermissionInfo.PROTECTION_SIGNATURE) {
allowed = doSignaturePermission(perm, pkg, bp, origPermissions);
allowed = grantSignaturePermission(perm, pkg, bp, origPermissions);
if (allowed) {
allowedSig = true;
}
@@ -5248,7 +5248,7 @@ public class PackageManagerService extends IPackageManager.Stub {
return allowed;
}
private boolean doSignaturePermission(String perm, PackageParser.Package pkg,
private boolean grantSignaturePermission(String perm, PackageParser.Package pkg,
BasePermission bp, HashSet<String> origPermissions) {
boolean allowed;
allowed = (compareSignatures(