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

2020-01-03 08:54:42 +00:00
parent 3607553d05 a986bc6420
commit 6aefe5f556
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
+++ b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
@@ -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() {