Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 932c6184 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Do not force review of hidden permissions 

Hidden permission do not show up in the UI and hence cannot get
reviewed.

Test: atest PermissionsHostTest
Fixes: 129070661
Change-Id: I7932176a676c662ce322d185634c70b50f0ea566
parent 2e5dd8cf

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+9 −4
Original line number Diff line number Diff line
@@ -1552,13 +1552,13 @@ public class PermissionManagerService { 
                    oldPermAreModernStorageModel = false;

                }



                boolean shouldBeRestricted;

                boolean shouldBeHidden;

                boolean shouldBeFixed;

                boolean shouldBeGranted = false;

                boolean shouldBeRevoked = false;

                int userFlags = -1;

                if (useLegacyStoragePermissionModel) {

                    shouldBeRestricted = isModernStoragePermission;

                    shouldBeHidden = isModernStoragePermission;

                    shouldBeFixed = isQApp || isModernStoragePermission;



                    if (shouldBeFixed) {
@@ -1576,7 +1576,7 @@ public class PermissionManagerService { 
                        shouldBeRevoked = !shouldBeGranted;

                    }

                } else {

                    shouldBeRestricted = isLegacyStoragePermission;

                    shouldBeHidden = isLegacyStoragePermission;

                    shouldBeFixed = isLegacyStoragePermission;



                    if (shouldBeFixed) {
@@ -1636,7 +1636,12 @@ public class PermissionManagerService { 


                    changed |= ps.updatePermissionFlags(mSettings.getPermissionLocked(perm), userId,

                            FLAG_PERMISSION_HIDDEN,

                            shouldBeRestricted ? FLAG_PERMISSION_HIDDEN : 0);

                            shouldBeHidden ? FLAG_PERMISSION_HIDDEN : 0);



                    if (shouldBeHidden) {

                        changed |= ps.updatePermissionFlags(mSettings.getPermissionLocked(perm),

                                userId, FLAG_PERMISSION_REVIEW_REQUIRED, 0);

                    }

                }



                if (changed) {