Merge "Respect past user choices in permisson review UI" into nyc-dev

1 files changed, 14 insertions, 0 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index fdb77934..1e8f48c3 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -325,6 +325,20 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
         return false;
     }
 
+    public boolean shouldRevokeOnUpgrade() {
+        if (mAppSupportsRuntimePermissions) {
+            return false;
+        }
+        final int permissionCount = mPermissions.size();
+        for (int i = 0; i < permissionCount; i++) {
+            Permission permission = mPermissions.valueAt(i);
+            if ((permission.getFlags() & PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE) != 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean grantRuntimePermissions(boolean fixedByTheUser) {
         return grantRuntimePermissions(fixedByTheUser, null);
     }