Prevent apps that target >= R from opting out of scoped storage

BUG: 137755945
BUG: 131432978
Test: atest RestrictedPermissionsTest
Test: atest RestrictedStoragePermissionSharedUidTest
Change-Id: I86dfaec8916754fcf9b199c553c32c84cefcad9a
This commit is contained in:
Nandana Dutt
2019-12-31 14:26:33 +00:00
parent cd87f72f02
commit a986bc6420

View File

@@ -145,7 +145,8 @@ public abstract class SoftRestrictedPermissionPolicy {
}
@Override
public boolean mayAllowExtraAppOp() {
return !shouldApplyRestriction && hasRequestedLegacyExternalStorage;
return !shouldApplyRestriction && hasRequestedLegacyExternalStorage
&& targetSDK <= Build.VERSION_CODES.Q;
}
@Override
public boolean mayDenyExtraAppOpIfGranted() {