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

Merge "Allow system apps to define ephemeral permissions" into oc-dev

Browse Source 
am: 0ddca92018

Change-Id: Ie68abfae227db1b5a62029671ab607ac38620ce3
This commit is contained in:
Chad Brubaker
2017-04-28 19:01:17 +00:00
committed by android-build-merger
parent a1e500ebf4 0ddca92018
commit 987da51b85
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17189,10 +17189,10 @@ public class PackageManagerService extends IPackageManager.Stub
PackageParser.Permission perm = pkg.permissions.get(i); PackageParser.Permission perm = pkg.permissions.get(i);
BasePermission bp = mSettings.mPermissions.get(perm.info.name); BasePermission bp = mSettings.mPermissions.get(perm.info.name);
// Don't allow anyone but the platform to define ephemeral permissions. // Don't allow anyone but the system to define ephemeral permissions.
if ((perm.info.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0 if ((perm.info.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0
&& !PLATFORM_PACKAGE_NAME.equals(pkg.packageName)) { && !systemApp) {
Slog.w(TAG, "Package " + pkg.packageName Slog.w(TAG, "Non-System package " + pkg.packageName
+ " attempting to delcare ephemeral permission " + " attempting to delcare ephemeral permission "
+ perm.info.name + "; Removing ephemeral."); + perm.info.name + "; Removing ephemeral.");
perm.info.protectionLevel &= ~PermissionInfo.PROTECTION_FLAG_EPHEMERAL; perm.info.protectionLevel &= ~PermissionInfo.PROTECTION_FLAG_EPHEMERAL;