From a986bc6420665453a898db61329f32cdc7f19cbb Mon Sep 17 00:00:00 2001
From: Nandana Dutt <nandana@google.com>
Date: Tue, 31 Dec 2019 14:26:33 +0000
Subject: [PATCH] Prevent apps that target >= R from opting out of scoped
 storage

BUG: 137755945
BUG: 131432978
Test: atest RestrictedPermissionsTest
Test: atest RestrictedStoragePermissionSharedUidTest
Change-Id: I86dfaec8916754fcf9b199c553c32c84cefcad9a
---
 .../android/server/policy/SoftRestrictedPermissionPolicy.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
index b0f22e4248ba8..f3a60185bfb63 100644
--- 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() {