commit 94d8974d6b357f364607f13e0287bf8867ac90f1
author shafik <shafik@google.com> Thu Aug 27 13:31:27 2020 +0100
committer shafik <shafik@google.com> Thu Aug 27 13:33:23 2020 +0100
tree eb9ef4de6891f410c531250d4e4aa4e714e6df61
parent bfa34ee7843eaa90a608ae01a2f243d6314254ff

Allow subtitle and playlist files in Documents and Downloads

Fix subtitles and playlists handling so that it adds DIRECTORY_MUSIC and
DIRECTORY_MOVIES to the default allowed primary directories, instead of
replacing them.

Test: atest CtsScopedStorageHostTest
Bug: 166057832
Change-Id: I9f3acd3c052390c9fd615b1b3dc9f74efb2c8e5b

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 125486f..70656f2 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -2542,17 +2542,17 @@
                         defaultMimeType = "audio/mpegurl";
                         defaultMediaType = FileColumns.MEDIA_TYPE_PLAYLIST;
                         defaultPrimary = Environment.DIRECTORY_MUSIC;
-                        allowedPrimary = Arrays.asList(
-                                Environment.DIRECTORY_MUSIC,
-                                Environment.DIRECTORY_MOVIES);
+                        allowedPrimary = new ArrayList<>(allowedPrimary);
+                        allowedPrimary.add(Environment.DIRECTORY_MUSIC);
+                        allowedPrimary.add(Environment.DIRECTORY_MOVIES);
                         break;
                     case FileColumns.MEDIA_TYPE_SUBTITLE:
                         defaultMimeType = "application/x-subrip";
                         defaultMediaType = FileColumns.MEDIA_TYPE_SUBTITLE;
                         defaultPrimary = Environment.DIRECTORY_MOVIES;
-                        allowedPrimary = Arrays.asList(
-                                Environment.DIRECTORY_MUSIC,
-                                Environment.DIRECTORY_MOVIES);
+                        allowedPrimary = new ArrayList<>(allowedPrimary);
+                        allowedPrimary.add(Environment.DIRECTORY_MUSIC);
+                        allowedPrimary.add(Environment.DIRECTORY_MOVIES);
                         break;
                 }
             } else if (defaultMediaType != actualMediaType) {