summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-04-18 12:23:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-18 12:23:54 -0700
commit4b12171c64176aa8967b7a91c293ab0403b26e46 (patch)
tree887d1f002f65ec0da658a0d0992d95cb52c8838e /core/java
parente7d9cd363d6095d37ca25d393c5e86067d3cc5e5 (diff)
parente704a15bbf0d8f2595215e13175c1f6cdcc8f5e5 (diff)
downloadframeworks_base-4b12171c64176aa8967b7a91c293ab0403b26e46.zip
frameworks_base-4b12171c64176aa8967b7a91c293ab0403b26e46.tar.gz
frameworks_base-4b12171c64176aa8967b7a91c293ab0403b26e46.tar.bz2
Merge "Update Environment fallback defaults."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Environment.java17
1 files changed, 7 insertions, 10 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 11f9445..f7f0263 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -113,19 +113,16 @@ public class Environment {
= getDirectory("ANDROID_SECURE_DATA", "/data/secure");
private static final File EXTERNAL_STORAGE_DIRECTORY
- = getDirectory("EXTERNAL_STORAGE", "/mnt/sdcard");
+ = getDirectory("EXTERNAL_STORAGE", "/storage/sdcard0");
- private static final File EXTERNAL_STORAGE_ANDROID_DATA_DIRECTORY
- = new File (new File(getDirectory("EXTERNAL_STORAGE", "/mnt/sdcard"),
- "Android"), "data");
+ private static final File EXTERNAL_STORAGE_ANDROID_DATA_DIRECTORY = new File(new File(
+ getDirectory("EXTERNAL_STORAGE", "/storage/sdcard0"), "Android"), "data");
- private static final File EXTERNAL_STORAGE_ANDROID_MEDIA_DIRECTORY
- = new File (new File(getDirectory("EXTERNAL_STORAGE", "/mnt/sdcard"),
- "Android"), "media");
+ private static final File EXTERNAL_STORAGE_ANDROID_MEDIA_DIRECTORY = new File(new File(
+ getDirectory("EXTERNAL_STORAGE", "/storage/sdcard0"), "Android"), "media");
- private static final File EXTERNAL_STORAGE_ANDROID_OBB_DIRECTORY
- = new File (new File(getDirectory("EXTERNAL_STORAGE", "/mnt/sdcard"),
- "Android"), "obb");
+ private static final File EXTERNAL_STORAGE_ANDROID_OBB_DIRECTORY = new File(new File(
+ getDirectory("EXTERNAL_STORAGE", "/storage/sdcard0"), "Android"), "obb");
private static final File DOWNLOAD_CACHE_DIRECTORY
= getDirectory("DOWNLOAD_CACHE", "/cache");