From 5d3b37b947ea55901cd19bd058f5379736c31c47 Mon Sep 17 00:00:00 2001 From: Garfield Tan Date: Wed, 1 Mar 2017 11:01:05 -0800 Subject: [PATCH] Remove DocumentsContract.ACTION_BROWSE. Test: It builds. Bug: 35760993 Change-Id: Icdd125d6e6329f703c4682b47b5b9fb80d7e1f27 --- core/java/android/os/storage/VolumeInfo.java | 2 +- core/java/android/provider/DocumentsContract.java | 3 --- .../src/com/android/mtp/ReceiverActivity.java | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 7b63b626175fc..a21e05e314b2d 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -435,7 +435,7 @@ public class VolumeInfo implements Parcelable { return null; } - final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE); + final Intent intent = new Intent(Intent.ACTION_VIEW); intent.addCategory(Intent.CATEGORY_DEFAULT); intent.setDataAndType(uri, DocumentsContract.Root.MIME_TYPE_ITEM); diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 54861628c4653..71a0349bce545 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -161,9 +161,6 @@ public final class DocumentsContract { /** {@hide} */ public static final String ACTION_MANAGE_DOCUMENT = "android.provider.action.MANAGE_DOCUMENT"; - /** {@hide} */ - public static final String ACTION_BROWSE = "android.provider.action.BROWSE"; - /** {@hide} */ public static final String ACTION_DOCUMENT_ROOT_SETTINGS = "android.provider.action.DOCUMENT_ROOT_SETTINGS"; diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java b/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java index 84745b29e428e..19c2c14478f19 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java @@ -46,8 +46,8 @@ public class ReceiverActivity extends Activity { final Uri uri = DocumentsContract.buildRootUri( MtpDocumentsProvider.AUTHORITY, deviceRootId); - final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE); - intent.setData(uri); + final Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setDataAndType(uri, DocumentsContract.Root.MIME_TYPE_ITEM); intent.addCategory(Intent.CATEGORY_DEFAULT); this.startActivity(intent); } catch (IOException exception) {