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

Merge into jb-mr1-dev

Browse Source 
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
This commit is contained in:
Jean-Baptiste Queru
2012-09-25 09:35:50 -07:00
parent ec1996131d 7d8bcb498d
commit a5e1d21f56
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,8 +109,6 @@ public class Environment {
// /storage/emulated/0
mExternalStorage = buildPath(emulatedBase, rawUserId);
// /storage/emulated/obb
mExternalStorageAndroidObb = buildPath(emulatedBase, "obb");
// /data/media/0
mMediaStorage = buildPath(mediaBase, rawUserId);
@@ -123,12 +121,11 @@ public class Environment {
// /storage/sdcard0
mExternalStorage = new File(rawExternalStorage);
// /storage/sdcard0/Android/obb
mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb");
// /data/media
mMediaStorage = new File(rawMediaStorage);
}
mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb");
mExternalStorageAndroidData = buildPath(mExternalStorage, DIRECTORY_ANDROID, "data");
mExternalStorageAndroidMedia = buildPath(mExternalStorage, DIRECTORY_ANDROID, "media");
}