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

Commit 8db82cde authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make legacy storage appop unsticky on upgrade to R"

parents 8a7c978c e1c1629d

services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java

+2 −1
Original line number Diff line number Diff line
@@ -122,8 +122,9 @@ public abstract class SoftRestrictedPermissionPolicy { 
                    PackageManager pm = context.getPackageManager();

                    int flags = pm.getPermissionFlags(permission, appInfo.packageName, user);

                    isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0;

                    shouldApplyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;

                    targetSDK = getMinimumTargetSDK(context, appInfo, user);

                    shouldApplyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0

                            || targetSDK > Build.VERSION_CODES.Q;

                    hasRequestedLegacyExternalStorage = hasUidRequestedLegacyExternalStorage(

                            appInfo.uid, context);

                    hasWriteMediaStorageGrantedForUid = hasWriteMediaStorageGrantedForUid(