commit 0ddca92018da69e7224b63cdedbf1944c63ddc34
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 28 18:51:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 28 18:51:12 2017 +0000
tree 44aa2eb340b9f7e5788556f4e53a42c453a35cb8
parent ebd44d0076bc81732cb346a342788a0024dd1b3e
parent ffa07d2a8fc6ccf742a30de2041115a428f3ff8d

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

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 15df545..a56590e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -17189,10 +17189,10 @@
                 PackageParser.Permission perm = pkg.permissions.get(i);
                 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
-                        && !PLATFORM_PACKAGE_NAME.equals(pkg.packageName)) {
-                    Slog.w(TAG, "Package " + pkg.packageName
+                        && !systemApp) {
+                    Slog.w(TAG, "Non-System package " + pkg.packageName
                             + " attempting to delcare ephemeral permission "
                             + perm.info.name + "; Removing ephemeral.");
                     perm.info.protectionLevel &= ~PermissionInfo.PROTECTION_FLAG_EPHEMERAL;