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

Commit cf54ce7f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset one-time permission on app storage clear" into rvc-dev am:... 

Merge "Reset one-time permission on app storage clear" into rvc-dev am: 64ea0ed7 am: a9cfd80c am: c87172cd

Change-Id: I4ebd7c0fcb8ae683d535b817d292b30fa3810422
parents 4faf9b25 c87172cd

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

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.content.pm.ApplicationInfo.AUTO_REVOKE_DISCOURAGED; 
import static android.content.pm.PackageManager.FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT;

import static android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION;

import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;

import static android.content.pm.PackageManager.FLAG_PERMISSION_ONE_TIME;

import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;

import static android.content.pm.PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;

import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT;
@@ -1656,7 +1657,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
        final int userSettableMask = FLAG_PERMISSION_USER_SET

                | FLAG_PERMISSION_USER_FIXED

                | FLAG_PERMISSION_REVOKED_COMPAT

                | FLAG_PERMISSION_REVIEW_REQUIRED;

                | FLAG_PERMISSION_REVIEW_REQUIRED

                | FLAG_PERMISSION_ONE_TIME;



        final int policyOrSystemFlags = FLAG_PERMISSION_SYSTEM_FIXED

                | FLAG_PERMISSION_POLICY_FIXED;