Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b12171c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Update Environment fallback defaults."

parents e7d9cd36 e704a15b

core/java/android/os/Environment.java

+7 −10
Original line number Diff line number Diff line
@@ -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");