| commit | 7b82cbbe3411396b187b68548f2c325b42e964a6 | [log] [tgz] |
|---|---|---|
| author | Zim <zezeozue@google.com> | Fri Dec 04 11:20:02 2020 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Wed Jun 16 01:11:20 2021 +0000 |
| tree | c92cfc8f4b9159f974a06b6994b38dc1dadfd3e1 | |
| parent | fbe5177bd5d704dabf434458649fd93a07d8d654 [diff] |
Block SAF directory access to /sdcard/Android This works for target R+ apps, but need to come up with a better story for target <R. The enforcement in DocumentsUI is target SDK based and those apps bypass the block_tree flag. Bug: 157320644 Test: atest DocumentsTest Change-Id: I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 (cherry picked from commit 9d508579aed406220c11022cfc983da46396bd07) Merged-In: I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 (cherry picked from commit 1ea98d44490a2383a604b546a5671a783c1000dd)
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 11d1b0a..087275e 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -322,6 +322,11 @@ return true; } + if (TextUtils.equals(Environment.DIRECTORY_ANDROID.toLowerCase(), + path.toLowerCase())) { + return true; + } + return false; } catch (IOException e) { throw new IllegalArgumentException(