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

Merge "Update Environment fallback defaults."

Browse Source
This commit is contained in:
Jeff Sharkey
2012-04-18 12:23:54 -07:00
committed by Android (Google) Code Review
parent e7d9cd363d e704a15bbf
commit 4b12171c64
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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