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

Commit 90b88500 authored by Garfield Tan's avatar Garfield Tan Committed by android-build-merger
Browse files

Merge "Remove BROWSE_ROOT intent handling." into arc-apps 

am: a0c4beea

Change-Id: Id5ce5a85f2474a184a6ca8ae3ecd951ced05b39e
parents 86ae0a16 a0c4beea

AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -76,11 +76,6 @@ 
            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.provider.action.BROWSE" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.document/root" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

src/com/android/documentsui/files/ActionHandler.java

+1 −3
Original line number Diff line number Diff line
@@ -454,9 +454,7 @@ public class ActionHandler<T extends Activity & Addons> extends AbstractActionHa 


    private boolean launchToRoot(Intent intent) {

        String action = intent.getAction();

        // TODO: Remove the "BROWSE" action once our min runtime in O.

        if (Intent.ACTION_VIEW.equals(action)

                || "android.provider.action.BROWSE".equals(action)) {

        if (Intent.ACTION_VIEW.equals(action)) {

            Uri uri = intent.getData();

            if (DocumentsContract.isRootUri(mActivity, uri)) {

                if (DEBUG) Log.d(TAG, "Launching with root URI.");