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

Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am: a47f9dad2b

Browse Source 
am: c4c1866228

* commit 'c4c1866228a776758d71cf4d171a17fa01891d89':
  Don't try overriding system fixed permissions on install
This commit is contained in:
Svetoslav Ganov
2015-11-02 21:10:49 +00:00
committed by android-build-merger
parent 6423c0a29b c4c1866228
commit 023f4d158d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1718,7 +1718,9 @@ public class PackageManagerService extends IPackageManager.Stub {
BasePermission bp = mSettings.mPermissions.get(permission);
if (bp != null && (bp.isRuntime() || bp.isDevelopment())
&& (grantedPermissions == null
|| ArrayUtils.contains(grantedPermissions, permission))) {
|| ArrayUtils.contains(grantedPermissions, permission))
&& (getPermissionFlags(permission, pkg.packageName, userId)
& PackageManager.FLAG_PERMISSION_SYSTEM_FIXED) == 0) {
grantRuntimePermission(pkg.packageName, permission, userId);
}
}