diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-04-02 06:48:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-02 06:48:40 +0000 |
commit | 75b10029655871bd1fbd8a420855a4919e014d8f (patch) | |
tree | f99dd788dc48cdc6224c0954ccb3c52432eab284 /src | |
parent | e55628d568df51c154c052813029069e245a07e5 (diff) | |
parent | eba095885aa2dfebf8ffae2bad492173c750e035 (diff) | |
download | android_packages_apps_PackageInstaller-75b10029655871bd1fbd8a420855a4919e014d8f.tar.gz android_packages_apps_PackageInstaller-75b10029655871bd1fbd8a420855a4919e014d8f.tar.bz2 android_packages_apps_PackageInstaller-75b10029655871bd1fbd8a420855a4919e014d8f.zip |
Merge "Properly show third-party defined permission in platform groups" into nyc-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 4 |
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 050e8b1e..214571ba 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; } |