diff options
| -rw-r--r-- | core/java/android/os/Environment.java | 9 | ||||
| -rwxr-xr-x | packages/DefaultContainerService/AndroidManifest.xml | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 6667a41f49ca..1607b96c0ad9 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -33,6 +33,9 @@ public class Environment { 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 @@ public class Environment { // /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() { diff --git a/packages/DefaultContainerService/AndroidManifest.xml b/packages/DefaultContainerService/AndroidManifest.xml index 319eb8d5b6b7..3dcd232915a4 100755 --- a/packages/DefaultContainerService/AndroidManifest.xml +++ b/packages/DefaultContainerService/AndroidManifest.xml @@ -8,6 +8,7 @@ <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" /> + <uses-permission android:name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" /> <application android:label="@string/service_name" android:allowBackup="false"> |