MediaProvider: Support to scan carrier's media folderstaging/cm-14.0-caf

Support to scan regionalization carrier package's media folder.

Conflicts:
	src/com/android/providers/media/MediaScannerService.java

Change-Id: Ic7da8734222b488139090ef11a34da6b408c1708
CRs-Fixed: 1025803

1 files changed, 21 insertions, 0 deletions

diff --git a/src/com/android/providers/media/MediaScannerService.java b/src/com/android/providers/media/MediaScannerService.java
index dbd1c017..4135bc37 100644
--- a/src/com/android/providers/media/MediaScannerService.java
+++ b/src/com/android/providers/media/MediaScannerService.java
@@ -37,8 +37,11 @@ import android.os.storage.StorageManager;
 import android.provider.MediaStore;
 import android.util.Log;
 
+import com.android.internal.os.RegionalizationEnvironment;
+
 import java.io.File;
 import java.util.Arrays;
+import java.util.List;
 
 public class MediaScannerService extends Service implements Runnable {
     private static final String TAG = "MediaScannerService";
@@ -231,6 +234,24 @@ public class MediaScannerService extends Service implements Runnable {
                                 Environment.getRootDirectory() + "/media",
                                 Environment.getOemDirectory() + "/media",
                         };
+
+                        if (RegionalizationEnvironment.isSupported()) {
+                            final List<File> regionalizationDirs = RegionalizationEnvironment
+                                    .getAllPackageDirectories();
+                            if (regionalizationDirs.size() > 0) {
+                                String[] mediaDirs =
+                                        new String[directories.length + regionalizationDirs.size()];
+                                for (int i = 0; i < directories.length; i++) {
+                                    mediaDirs[i] = directories[i];
+                                }
+                                int j = directories.length;
+                                for (File f : regionalizationDirs) {
+                                    mediaDirs[j] = f.getAbsolutePath() + "/system/media";
+                                    j++;
+                                }
+                                directories = mediaDirs;
+                            }
+                        }
                     }
                     else if (MediaProvider.EXTERNAL_VOLUME.equals(volume)) {
                         // scan external storage volumes