Merge "Show basic feature warning for default granted permissions" into mnc-dev

3 files changed, 20 insertions, 0 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 59130c44..8e86678d 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -207,6 +207,18 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
         return mAppSupportsRuntimePermissions;
     }
 
+
+    public boolean hasGrantedByDefaultPermission() {
+        final int permissionCount = mPermissions.size();
+        for (int i = 0; i < permissionCount; i++) {
+            Permission permission = mPermissions.valueAt(i);
+            if (permission.isGrantedByDefault()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean hasAppOpPermission() {
         final int permissionCount = mPermissions.size();
         for (int i = 0; i < permissionCount; i++) {
diff --git a/src/com/android/packageinstaller/permission/model/Permission.java b/src/com/android/packageinstaller/permission/model/Permission.java
index da234bdb..1be4e75b 100644
--- a/src/com/android/packageinstaller/permission/model/Permission.java
+++ b/src/com/android/packageinstaller/permission/model/Permission.java
@@ -88,6 +88,10 @@ public final class Permission {
         return (mFlags & PackageManager.FLAG_PERMISSION_USER_SET) != 0;
     }
 
+    public boolean isGrantedByDefault() {
+        return (mFlags & PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0;
+    }
+
     public void setUserSet(boolean userSet) {
         if (userSet) {
             mFlags |= PackageManager.FLAG_PERMISSION_USER_SET;
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java
index b8ba650d..9c76f211 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionApps.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java
@@ -319,6 +319,10 @@ public class PermissionApps {
             return mAppPermissionGroup.isSystemFixed();
         }
 
+        public boolean hasGrantedByDefaultPermissions() {
+            return mAppPermissionGroup.hasGrantedByDefaultPermission();
+        }
+
         public boolean hasRuntimePermissions() {
             return mAppPermissionGroup.hasRuntimePermission();
         }