commit dfa45309e09bcdbad877e4e6a6005f348962d64d
author Jeff Sharkey <jsharkey@android.com> Wed Sep 12 16:25:22 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Thu Sep 13 01:04:15 2012 -0700
tree 464ef2f255c93afb6c3907c3d3c69c91c3db08d8
parent 8b29d63d0857337057db707549ef1faed39792fd

Give DefaultContainerService all external storage.

Now we can bind to just one instance of DCS, instead of requiring
one-per-user. This also means we can operate on otherwise-stopped
users.

Bug: 7003520
Change-Id: I4881e064ae8942907f6a02c6b868926223455cdc

core/java/android/os/Environment.java

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 6667a41f..1607b96 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -33,6 +33,9 @@
     private static final String ENV_EXTERNAL_STORAGE = "EXTERNAL_STORAGE";
     private static final String ENV_EMULATED_STORAGE_TARGET = "EMULATED_STORAGE_TARGET";
 
+    /** {@hide} */
+    public static String DIRECTORY_ANDROID = "Android";
+
     private static final File ROOT_DIRECTORY
             = getDirectory("ANDROID_ROOT", "/system");
 
@@ -111,11 +114,11 @@
                 // /storage/sdcard0
                 mExternalStorage = new File(rawExternalStorage);
                 // /storage/sdcard0/Android/obb
-                mExternalStorageAndroidObb = buildPath(mExternalStorage, "Android", "obb");
+                mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb");
             }
 
-            mExternalStorageAndroidData = buildPath(mExternalStorage, "Android", "data");
-            mExternalStorageAndroidMedia = buildPath(mExternalStorage, "Android", "media");
+            mExternalStorageAndroidData = buildPath(mExternalStorage, DIRECTORY_ANDROID, "data");
+            mExternalStorageAndroidMedia = buildPath(mExternalStorage, DIRECTORY_ANDROID, "media");
         }
 
         public File getExternalStorageDirectory() {