diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:35:50 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:35:53 -0700 |
| commit | a5e1d21f566c8df750d766c76f6a99432a703c5e (patch) | |
| tree | 5d63c79b27cd2d88c1fbbb879e39722549ebcf94 /core/java | |
| parent | ec1996131d2e17408a22fd55fbc3edba5ea80d02 (diff) | |
| parent | 7d8bcb498d4cfb90202335781df1ffa92e96c18b (diff) | |
| download | frameworks_base-a5e1d21f566c8df750d766c76f6a99432a703c5e.zip frameworks_base-a5e1d21f566c8df750d766c76f6a99432a703c5e.tar.gz frameworks_base-a5e1d21f566c8df750d766c76f6a99432a703c5e.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Environment.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 364004b..5c4c036 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -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"); } |