Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ib497dc5c7c89076d616d027970afc35df7813ef1
This commit is contained in:
TreeHugger Robot
2020-03-20 19:43:18 +00:00
committed by Automerger Merge Worker
parent 1d6121a369 a6d6d4e485
commit 17166b13c6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
View File

@@ -163,7 +163,7 @@ public abstract class SoftRestrictedPermissionPolicy {
} }
@Override @Override
public boolean mayAllowExtraAppOp() { public boolean mayAllowExtraAppOp() {
return !shouldApplyRestriction && targetSDK <= Build.VERSION_CODES.Q return !shouldApplyRestriction
&& (hasRequestedLegacyExternalStorage && (hasRequestedLegacyExternalStorage
|| hasWriteMediaStorageGrantedForUid || hasWriteMediaStorageGrantedForUid
|| shouldPreserveLegacyExternalStorage); || shouldPreserveLegacyExternalStorage);