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

Commit 34a9d527 authored by Felipe Leme's avatar Felipe Leme
Browse files

Removed Intent.OPEN_EXTERNAL_DIRECTORY. 

Such intent is now encapsulated by StorageVolume.createAccessIntent().

BUG: 26742218

Change-Id: I2e2bd71126ecd74981f77b0af7d069f51aaece74
parent 04a5d40c

api/removed.txt

+0 −8
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ package android.app.admin { 


}



package android.content {



  public class Intent implements java.lang.Cloneable android.os.Parcelable {

    field public static final java.lang.String ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";

  }



}



package android.content.pm {



  public class PackageInfo implements android.os.Parcelable {

api/system-removed.txt

+0 −8
Original line number Diff line number Diff line
@@ -6,14 +6,6 @@ package android.app { 


}



package android.content {



  public class Intent implements java.lang.Cloneable android.os.Parcelable {

    field public static final java.lang.String ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";

  }



}



package android.content.pm {



  public class PackageInfo implements android.os.Parcelable {

api/test-removed.txt

+0 −8
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ package android.app.admin { 


}



package android.content {



  public class Intent implements java.lang.Cloneable android.os.Parcelable {

    field public static final java.lang.String ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";

  }



}



package android.content.pm {



  public class PackageInfo implements android.os.Parcelable {

core/java/android/content/Intent.java

+0 −39
Original line number Diff line number Diff line
@@ -3186,44 +3186,6 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String

            ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";



    /**

     * Activity Action: Give access to a standard storage directory after obtaining the user's

     * approval.

     * <p>

     * When invoked, the system will ask the user to grant access to the requested directory (and

     * its descendants).

     * <p>

     * To gain access to descendant (child, grandchild, etc) documents, use

     * {@link DocumentsContract#buildDocumentUriUsingTree(Uri, String)} and

     * {@link DocumentsContract#buildChildDocumentsUriUsingTree(Uri, String)} with the returned URI.

     * <p>

     * Input: full path to a standard directory, in the form of

     * {@code STORAGE_ROOT + STANDARD_DIRECTORY}, where {@code STORAGE_ROOT} is the physical path of

     * a storage container, and {@code STANDARD_DIRECTORY} is one of

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

     * {@link Environment#DIRECTORY_RINGTONES}, {@link Environment#DIRECTORY_ALARMS},

     * {@link Environment#DIRECTORY_NOTIFICATIONS}, {@link Environment#DIRECTORY_PICTURES},

     * {@link Environment#DIRECTORY_MOVIES}, {@link Environment#DIRECTORY_DOWNLOADS},

     * {@link Environment#DIRECTORY_DCIM}, or {@link Environment#DIRECTORY_DOCUMENTS}

     * <p>

     * For example, to open the "Pictures" folder in the default external storage, the intent's data

     * would be: {@code Uri.fromFile(new File(Environment.getExternalStorageDirectory(),

     * Environment.DIRECTORY_PICTURES))}.

     * <p>

     * Output: The URI representing the requested directory tree.

     *

     * @see DocumentsContract

     *

     * {@removed}

     *

     * Will be removed / hidden before N is published; apps should use

     * {@link android.os.storage.StorageManager#getVolumeList()} and

     * {@link android.os.storage.StorageVolume#createAccessIntent(String)} instead.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String

            ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";



    /**

     * Broadcast Action: List of dynamic sensor is changed due to new sensor being connected or

     * exisiting sensor being disconnected.
@@ -8958,7 +8920,6 @@ public class Intent implements Parcelable, Cloneable { 
                case ACTION_MEDIA_SCANNER_SCAN_FILE:

                case ACTION_PACKAGE_NEEDS_VERIFICATION:

                case ACTION_PACKAGE_VERIFIED:

                case ACTION_OPEN_EXTERNAL_DIRECTORY: // TODO: temporary until bug 26742218 is fixed

                    // Ignore legacy actions

                    break;

                default:

core/java/android/os/storage/StorageVolume.java

+16 −2
Original line number Diff line number Diff line
@@ -102,6 +102,19 @@ public class StorageVolume implements Parcelable { 
    // Also sent on ACTION_MEDIA_UNSHARED, which is @hide

    public static final String EXTRA_STORAGE_VOLUME = "android.os.storage.extra.STORAGE_VOLUME";



    /**

     * Name of the String extra used by {@link #createAccessIntent(String) createAccessIntent}.

     *

     * @hide

     */

    public static final String EXTRA_DIRECTORY_NAME = "android.os.storage.extra.DIRECTORY_NAME";



    /**

     * Name of the intent used by {@link #createAccessIntent(String) createAccessIntent}.

     */

    private static final String ACTION_OPEN_EXTERNAL_DIRECTORY =

            "android.os.storage.action.OPEN_EXTERNAL_DIRECTORY";



    /** {@hide} */

    public static final int STORAGE_ID_INVALID = 0x00000000;

    /** {@hide} */
@@ -318,8 +331,9 @@ public class StorageVolume implements Parcelable { 
     * @see DocumentsContract

     */

    public Intent createAccessIntent(@NonNull String directoryName) {

        final Intent intent = new Intent(Intent.ACTION_OPEN_EXTERNAL_DIRECTORY);

        intent.setData(Uri.fromFile(new File(mPath, directoryName)));

        final Intent intent = new Intent(ACTION_OPEN_EXTERNAL_DIRECTORY);

        intent.putExtra(EXTRA_STORAGE_VOLUME, this);

        intent.putExtra(EXTRA_DIRECTORY_NAME, directoryName);

        return intent;

    }