From eba095885aa2dfebf8ffae2bad492173c750e035 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Fri, 1 Apr 2016 23:43:05 -0700 Subject: Properly show third-party defined permission in platform groups Apps can define permissions in the platform groups. If a legacy app deifines a permission in a platform group we were showing the permission twice because we failed to group the custom permission in the platform group when building the UI. bug:26142772 Change-Id: I263bff8631e14395c9000e5e54b0e160969e1eb2 --- .../android/packageinstaller/permission/model/AppPermissionGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 0771a0f4..99621a7a 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -136,9 +136,9 @@ public final class AppPermissionGroup implements Comparable continue; } - // Don't allow toggle of non platform defined permissions for legacy apps via app ops. + // Don't allow toggling non-platform permission groups for legacy apps via app ops. if (packageInfo.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1 - && !PLATFORM_PACKAGE_NAME.equals(requestedPermissionInfo.packageName)) { + && !PLATFORM_PACKAGE_NAME.equals(groupInfo.packageName)) { continue; } -- cgit v1.2.3