Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cae22d83: Merge "Give DefaultContainerService all external storage." into jb-mr1-dev

Browse Source 
* commit 'cae22d83a7225c38ef6f51723e13d5741d1cd69b':
  Give DefaultContainerService all external storage.
This commit is contained in:
Jeff Sharkey
2012-09-13 01:34:24 -07:00
committed by Android Git Automerger
parent c90493ff58 cae22d83a7
commit 2b28b37b20
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/os/Environment.java
View File

@@ -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() {

1
packages/DefaultContainerService/AndroidManifest.xml
View File

@@ -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">