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

Commit e0a5f0de authored by Nandana Dutt's avatar Nandana Dutt Committed by Automerger Merge Worker
Browse files

Merge "Note API alternatives in javadoc" into sc-v2-dev am: 138f08b5 am: f8d671f6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390553

Change-Id: I49a1141e2429564a7c00a49ebbc77bfa1abc71a0
parents 33b42865 f8d671f6

core/java/android/os/Environment.java

+6 −0
Original line number Diff line number Diff line
@@ -693,6 +693,9 @@ public class Environment { 
     * <p>

     * {@sample development/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java

     * monitor_storage}

     * <p>

     * Note that alternatives such as {@link Context#getExternalFilesDir(String)} or

     * {@link MediaStore} offer better performance.

     *

     * @see #getExternalStorageState()

     * @see #isExternalStorageRemovable()
@@ -993,6 +996,9 @@ public class Environment { 
     * </p>

     * {@sample development/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java

     * public_picture}

     * <p>

     * Note that alternatives such as {@link Context#getExternalFilesDir(String)} or

     * {@link MediaStore} offer better performance.

     *

     * @param type The type of storage directory to return. Should be one of

     *            {@link #DIRECTORY_MUSIC}, {@link #DIRECTORY_PODCASTS},