diff options
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 5 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/utils/Utils.java | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 9d65bcc0..e54b7029 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -275,8 +275,9 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> if (permission.isGranted()) { return true; } - } else if (permission.isGranted() && permission.getAppOp() - != AppOpsManager.OP_NONE && permission.isAppOpAllowed()) { + } else if (permission.isGranted() && ((permission.getAppOp() + != AppOpsManager.OP_NONE && permission.isAppOpAllowed()) + || permission.getAppOp() == AppOpsManager.OP_NONE)) { return true; } } 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; } |