diff options
| author | Nick Kralevich <nnk@google.com> | 2013-04-02 12:51:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-02 12:51:56 -0700 |
| commit | bad82253361dc9947ea0bf97dcb3547e00d4cfaf (patch) | |
| tree | 0f203c00dba739d4cf7b561c0a960dc91c9926ed /services/java/com/android/server/pm/PackageManagerService.java | |
| parent | f486361607e0b8e62e0ea569a73f42723d03fd83 (diff) | |
| parent | d2cc888cb9d5dbf87146ccd8fe02ea05121c02d8 (diff) | |
am d2cc888c: am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev
* commit 'd2cc888cb9d5dbf87146ccd8fe02ea05121c02d8':
doSignaturePermission -> grantSignaturePermission
Diffstat (limited to 'services/java/com/android/server/pm/PackageManagerService.java')
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 24a6c97ec4b9..28bb637054d2 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -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( |