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

Commit e1c1629d authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Make legacy storage appop unsticky on upgrade to R 

Newly installed apps that target R are not in legacy storage.
However an app that upgrades from a version that has legacy storage
currently keeps the legacy access. Make it unsticky
if new version targets R.

BUG: 148944140
Test: atest RestrictedPermissionsTest
Test: atest RestrictedStoragePermissionSharedUidTest
Change-Id: If1fb226492bbaa747ed13908e49144c3a4aa4093
parent af5dfc2f

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(