Merge "Fix preserveLegacyExternalStorage logic" into rvc-dev am: 9ffa70c415 am: 6369ea993b am: a6d6d4e485 am: 17166b13c6

Change-Id: Id70a8c08f8c591ba3de58b87fada82eca26b2117
2020-03-20 20:06:35 +00:00
parent 8c198fcf57 17166b13c6
commit 51283ca3ee
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
+++ b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
@@ -163,7 +163,7 @@ public abstract class SoftRestrictedPermissionPolicy {
                    }
                    @Override
                    public boolean mayAllowExtraAppOp() {
-                        return !shouldApplyRestriction && targetSDK <= Build.VERSION_CODES.Q
+                        return !shouldApplyRestriction
                                && (hasRequestedLegacyExternalStorage
                                        || hasWriteMediaStorageGrantedForUid
                                        || shouldPreserveLegacyExternalStorage);