Initial support for subtitles and lyrics.
Ideally audio and video files would embed information like subtitles
and lyrics directly into the container format, but alas the world
hasn't completely moved to Matroska yet.
Thus we're willing to recognize these side-car files and let them be
visible to apps that have gained the "Audio" or "Video" permissions.
Bug: 132359020, 143549606
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I07513c48e245a00c0288a4b0fbee322cb02f49a9
diff --git a/api/current.txt b/api/current.txt
index beea876..4c4895c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -38908,6 +38908,7 @@
field public static final int MEDIA_TYPE_IMAGE = 1; // 0x1
field public static final int MEDIA_TYPE_NONE = 0; // 0x0
field public static final int MEDIA_TYPE_PLAYLIST = 4; // 0x4
+ field public static final int MEDIA_TYPE_SUBTITLE = 5; // 0x5
field public static final int MEDIA_TYPE_VIDEO = 3; // 0x3
field public static final String MIME_TYPE = "mime_type";
field public static final String PARENT = "parent";
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 2c53025..54a1a73 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -1590,31 +1590,41 @@
/**
* Constant for the {@link #MEDIA_TYPE} column indicating that file
- * is not an audio, image, video or playlist file.
+ * is not an audio, image, video, playlist, or subtitles file.
*/
public static final int MEDIA_TYPE_NONE = 0;
/**
- * Constant for the {@link #MEDIA_TYPE} column indicating that file is an image file.
+ * Constant for the {@link #MEDIA_TYPE} column indicating that file
+ * is an image file.
*/
public static final int MEDIA_TYPE_IMAGE = 1;
/**
- * Constant for the {@link #MEDIA_TYPE} column indicating that file is an audio file.
+ * Constant for the {@link #MEDIA_TYPE} column indicating that file
+ * is an audio file.
*/
public static final int MEDIA_TYPE_AUDIO = 2;
/**
- * Constant for the {@link #MEDIA_TYPE} column indicating that file is a video file.
+ * Constant for the {@link #MEDIA_TYPE} column indicating that file
+ * is a video file.
*/
public static final int MEDIA_TYPE_VIDEO = 3;
/**
- * Constant for the {@link #MEDIA_TYPE} column indicating that file is a playlist file.
+ * Constant for the {@link #MEDIA_TYPE} column indicating that file
+ * is a playlist file.
*/
public static final int MEDIA_TYPE_PLAYLIST = 4;
/**
+ * Constant for the {@link #MEDIA_TYPE} column indicating that file
+ * is a subtitles or lyrics file.
+ */
+ public static final int MEDIA_TYPE_SUBTITLE = 5;
+
+ /**
* Column indicating if the file is part of Downloads collection.
* @hide
*/