From cae41c406563976074f90331980b07016c626eb9 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Mon, 4 Feb 2019 18:16:15 -0800 Subject: [PATCH] Translate sandboxed paths correctly for MediaStore.SCAN_FILE_CALL. Bug: 123642484 Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore_DownloadsTest.java Change-Id: Ie19beb12e546b1b78e8e0d056558444a255f394d --- api/test-current.txt | 1 + core/java/android/provider/MediaStore.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 9023a859a2869..d89f8ef2ac17d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1756,6 +1756,7 @@ package android.provider { method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static long getContributedMediaSize(android.content.Context, String, android.os.UserHandle) throws java.io.IOException; method @NonNull public static java.io.File getVolumePath(@NonNull String) throws java.io.FileNotFoundException; method @NonNull public static java.util.Collection getVolumeScanPaths(@NonNull String) throws java.io.FileNotFoundException; + field public static final String EXTRA_ORIGINATED_FROM_SHELL = "android.intent.extra.originated_from_shell"; field public static final String SCAN_FILE_CALL = "scan_file"; field public static final String SCAN_VOLUME_CALL = "scan_volume"; } diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 0743c23080fdc..67c8400069489 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -109,6 +109,16 @@ public final class MediaStore { /** {@hide} */ @TestApi public static final String SCAN_VOLUME_CALL = "scan_volume"; + /** + * Extra used with {@link #SCAN_FILE_CALL} or {@link #SCAN_VOLUME_CALL} to indicate that + * the file path originated from shell. + * + * {@hide} + */ + @TestApi + public static final String EXTRA_ORIGINATED_FROM_SHELL = + "android.intent.extra.originated_from_shell"; + /** * The method name used by the media scanner and mtp to tell the media provider to * rescan and reclassify that have become unhidden because of renaming folders or