From 3c44cc5448eed0b74b37f022e8695c36fb75f33c Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Tue, 1 Sep 2015 18:29:10 -0700 Subject: Display properly runtime permissions without a corresponding app op. We added the GET_ACCOUNTS permission to the contacts group but it does not have an app op. The UI code was written with the assumption that all runtime permissions have an app op and was not showing the contacts group if the only requested permission from that group was GET_ACCOUNTS. bug:23726958 Change-Id: Iad5493297901c3f1144f4d58a3dad3f022c593a1 --- .../android/packageinstaller/permission/utils/Utils.java | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/com/android/packageinstaller/permission/utils') diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java index 7b9a2b65..2940a729 100644 --- a/src/com/android/packageinstaller/permission/utils/Utils.java +++ b/src/com/android/packageinstaller/permission/utils/Utils.java @@ -84,13 +84,6 @@ public class Utils { return false; } - // Yes this is possible. We have leftover permissions that - // are not in the final groups and we want to get rid of, - // therefore we do not have app ops for legacy support. - if (!group.hasRuntimePermission() && !group.hasAppOpPermission()) { - return false; - } - final boolean isPlatformPermission = group.getDeclaringPackage().equals(OS_PKG); // Show legacy permissions only if the user chose that. if (isPlatformPermission @@ -108,12 +101,6 @@ public class Utils { return false; } - // Yes this is possible. We have leftover permissions that - // are not in the final groups and we want to get rid of, - // therefore we do not have app ops for legacy support. - if (!app.hasRuntimePermissions() && !app.hasAppOpPermissions()) { - return false; - } return true; } -- cgit v1.2.3