commit 57a1e4c4aa37a6e479f9b5c6b43941c3aefa62e0
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 03 16:03:23 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 03 16:03:23 2020 +0000
tree 68fb47ff64caaf7c71d5d150a37cbcedecfed6bb
parent 1ee3dda02dd428199ecccb6a358bcdd8c68d64c3
parent ebd5b2447eee1ddaf6b1e0f7bab6c5dbb1e983a2

Merge "Revert submission 9996524-restrict_legacy_appop"

services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java

diff --git a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
index f3a6018..b0f22e4 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 @@
                     }
                     @Override
                     public boolean mayAllowExtraAppOp() {
-                        return !shouldApplyRestriction && hasRequestedLegacyExternalStorage
-                                && targetSDK <= Build.VERSION_CODES.Q;
+                        return !shouldApplyRestriction && hasRequestedLegacyExternalStorage;
                     }
                     @Override
                     public boolean mayDenyExtraAppOpIfGranted() {