Prevent modification of system fixed permissions

Change-Id: I84c9085550c910fe7ae5953796f164d72077c4bb

2 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 5c40c32e..a018f8c2 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -248,6 +248,11 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
         // to the permission if the permission is granted to the app.
         for (Permission permission : mPermissions.values()) {
             if (mAppSupportsRuntimePermissions) {
+                // Do not touch permissions fixed by the system.
+                if (permission.isSystemFixed()) {
+                    return false;
+                }
+
                 // Grant the permission if needed.
                 if (!permission.isGranted()) {
                     permission.setGranted(true);
@@ -334,6 +339,11 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
         // to the permission if the permission is granted to the app.
         for (Permission permission : mPermissions.values()) {
             if (mAppSupportsRuntimePermissions) {
+                // Do not touch permissions fixed by the system.
+                if (permission.isSystemFixed()) {
+                    return false;
+                }
+
                 // Revoke the permission if needed.
                 if (permission.isGranted()) {
                     permission.setGranted(false);
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index 0659070c..3efc35dc 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -222,7 +222,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
         extraPerms.setTitle(R.string.additional_permissions);
 
         for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
-            // We currently will not show permissions fixed by the system
+            // We currently will not show permissions fixed by the system.
             // which is what the system does for system components.
             if (group.isSystemFixed()) {
                 continue;