summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2016-04-01 23:43:05 -0700
committerSvet Ganov <svetoslavganov@google.com>2016-04-01 23:47:59 -0700
commiteba095885aa2dfebf8ffae2bad492173c750e035 (patch)
tree763f64a1325bc40dd474fe6da644d24a4bd6607f /src
parent3f07e6589d0f036df10d97f676a375b2ce04ae3b (diff)
downloadandroid_packages_apps_PackageInstaller-eba095885aa2dfebf8ffae2bad492173c750e035.tar.gz
android_packages_apps_PackageInstaller-eba095885aa2dfebf8ffae2bad492173c750e035.tar.bz2
android_packages_apps_PackageInstaller-eba095885aa2dfebf8ffae2bad492173c750e035.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/model/AppPermissionGroup.java4
1 files changed, 2 insertions, 2 deletions
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<AppPermissionGroup>
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;
}