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

Change-Id: Ib497dc5c7c89076d616d027970afc35df7813ef1
2020-03-20 19:43:18 +00:00
parent 1d6121a369 a6d6d4e485
commit 17166b13c6
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);