summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-03-20 18:59:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-20 18:59:59 +0000
commit9ffa70c41527e239b66fc3bb83f93da2d28713ad (patch)
treeaca6edc4284bb0781fe8037adde6ccfca8749574
parent25098aa1473705909e8b5afd1415adba231ee687 (diff)
parentc36a733b29d33fe90632ae96686fed22282b2f2a (diff)
Merge "Fix preserveLegacyExternalStorage logic" into rvc-dev
-rw-r--r--services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java b/services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
index 6c18c8d04363..39aeafc345ea 100644
--- 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);