From ebd5b2447eee1ddaf6b1e0f7bab6c5dbb1e983a2 Mon Sep 17 00:00:00 2001
From: Kholoud Mohamed <kholoudm@google.com>
Date: Fri, 3 Jan 2020 14:23:59 +0000
Subject: [PATCH] Revert submission 9996524-restrict_legacy_appop

Reason for revert: Potential culprit for Bug 147134548 - verifying through Forrest before revert submission
Reverted Changes:
I63a26fd59: Verify scoped storage policy for R
I86dfaec89: Prevent apps that target >= R from opting out of s...

Change-Id: I9d27fa97fb939dc52855f9f09c37f9b3632a9222
---
 .../android/server/policy/SoftRestrictedPermissionPolicy.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
index f3a60185bfb63..b0f22e4248ba8 100644
--- a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
+++ b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
@@ -145,8 +145,7 @@ public abstract class SoftRestrictedPermissionPolicy {
                     }
                     @Override
                     public boolean mayAllowExtraAppOp() {
-                        return !shouldApplyRestriction && hasRequestedLegacyExternalStorage
-                                && targetSDK <= Build.VERSION_CODES.Q;
+                        return !shouldApplyRestriction && hasRequestedLegacyExternalStorage;
                     }
                     @Override
                     public boolean mayDenyExtraAppOpIfGranted() {