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

Commit 062ac293 authored by Nandana Dutt's avatar Nandana Dutt Committed by Android (Google) Code Review
Browse files

Merge "Undeprecate storage directory APIs"

parents 6735bff3 74bf4e68

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -31075,8 +31075,8 @@ package android.os { 
    ctor public Environment();

    method public static java.io.File getDataDirectory();

    method public static java.io.File getDownloadCacheDirectory();

    method @Deprecated public static java.io.File getExternalStorageDirectory();

    method @Deprecated public static java.io.File getExternalStoragePublicDirectory(String);

    method public static java.io.File getExternalStorageDirectory();

    method public static java.io.File getExternalStoragePublicDirectory(String);

    method public static String getExternalStorageState();

    method public static String getExternalStorageState(java.io.File);

    method @NonNull public static java.io.File getRootDirectory();

core/java/android/os/Environment.java

+0 −10
Original line number Diff line number Diff line
@@ -189,13 +189,11 @@ public class Environment { 
        }



        @UnsupportedAppUsage

        @Deprecated

        public File getExternalStorageDirectory() {

            return getExternalDirs()[0];

        }



        @UnsupportedAppUsage

        @Deprecated

        public File getExternalStoragePublicDirectory(String type) {

            return buildExternalStoragePublicDirs(type)[0];

        }
@@ -698,11 +696,7 @@ public class Environment { 
     *

     * @see #getExternalStorageState()

     * @see #isExternalStorageRemovable()

     * @deprecated Alternatives such as {@link Context#getExternalFilesDir(String)},

     *             {@link MediaStore}, or {@link Intent#ACTION_OPEN_DOCUMENT} offer better

     *             performance.

     */

    @Deprecated

    public static File getExternalStorageDirectory() {

        throwIfUserRequired();

        return sCurrentUser.getExternalDirs()[0];
@@ -1009,11 +1003,7 @@ public class Environment { 
     * @return Returns the File path for the directory. Note that this directory

     *         may not yet exist, so you must make sure it exists before using

     *         it such as with {@link File#mkdirs File.mkdirs()}.

     * @deprecated Alternatives such as {@link Context#getExternalFilesDir(String)},

     *             {@link MediaStore}, or {@link Intent#ACTION_OPEN_DOCUMENT} offer better

     *             performance.

     */

    @Deprecated

    public static File getExternalStoragePublicDirectory(String type) {

        throwIfUserRequired();

        return sCurrentUser.buildExternalStoragePublicDirs(type)[0];