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

am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev

Browse Source 
* commit 'c157cac9b2827a4eeb0ea29209fbb879a6076de4':
  System package permission decls take precedence over 3rd party apps'
This commit is contained in:
Christopher Tate
2013-11-06 16:57:01 -08:00
committed by Android Git Automerger
parent b3651b6fc3 c157cac9b2
commit aa719e92ff
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4959,6 +4959,18 @@ public class PackageManagerService extends IPackageManager.Stub {
permissionMap.put(p.info.name, bp);
}
if (bp.perm == null) {
if (bp.sourcePackage != null
&& !bp.sourcePackage.equals(p.info.packageName)) {
// If this is a permission that was formerly defined by a non-system
// app, but is now defined by a system app (following an upgrade),
// discard the previous declaration and consider the system's to be
// canonical.
if (isSystemApp(p.owner)) {
Slog.i(TAG, "New decl " + p.owner + " of permission "
+ p.info.name + " is system");
bp.sourcePackage = null;
}
}
if (bp.sourcePackage == null
|| bp.sourcePackage.equals(p.info.packageName)) {
BasePermission tree = findPermissionTreeLP(p.info.name);