Scan preloads folder for content

When doing a scan for external content, also scan the
preloads folder where there could be demo photos and
videos. This is only scanned when running as a demo
user.

Bug: 29940807
Change-Id: Ib63023dc46a8d8db1ffa6435248d679484c9a5f5

1 files changed, 11 insertions, 2 deletions

diff --git a/src/com/android/providers/media/MediaScannerService.java b/src/com/android/providers/media/MediaScannerService.java
index dbd1c0172..7ce17a294 100644
--- a/src/com/android/providers/media/MediaScannerService.java
+++ b/src/com/android/providers/media/MediaScannerService.java
@@ -33,10 +33,13 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.PowerManager;
 import android.os.Process;
+import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.provider.MediaStore;
 import android.util.Log;
 
+import com.android.internal.util.ArrayUtils;
+
 import java.io.File;
 import java.util.Arrays;
 
@@ -224,7 +227,7 @@ public class MediaScannerService extends Service implements Runnable {
                 } else {
                     String volume = arguments.getString("volume");
                     String[] directories = null;
-                    
+
                     if (MediaProvider.INTERNAL_VOLUME.equals(volume)) {
                         // scan internal media storage
                         directories = new String[] {
@@ -234,7 +237,13 @@ public class MediaScannerService extends Service implements Runnable {
                     }
                     else if (MediaProvider.EXTERNAL_VOLUME.equals(volume)) {
                         // scan external storage volumes
-                        directories = mExternalStoragePaths;
+                        if (getSystemService(UserManager.class).isDemoUser()) {
+                            directories = ArrayUtils.appendElement(String.class,
+                                    mExternalStoragePaths,
+                                    Environment.getDataPreloadsDirectory().getAbsolutePath());
+                        } else {
+                            directories = mExternalStoragePaths;
+                        }
                     }
 
                     if (directories != null) {