summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2019-02-05 06:00:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-05 06:00:06 +0000
commit609346bfd9a68367bb6d43ccee73e4d1567875be (patch)
treef47304f2679a7d2413b0fa446d4fcaef93a3c79e /core/java
parent8c31ae712e575c8256f115dfdba285ed8e02ae1c (diff)
parentcae41c406563976074f90331980b07016c626eb9 (diff)
Merge "Translate sandboxed paths correctly for MediaStore.SCAN_FILE_CALL."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/MediaStore.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 0743c23080fd..67c840006948 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -110,6 +110,16 @@ public final class MediaStore {
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
* removing nomedia files