From c2b1237ca53fe2de68bdd9e59c1dd3572679965d Mon Sep 17 00:00:00 2001 From: Tomasz Mikolajewski Date: Thu, 21 Jan 2016 12:38:03 +0900 Subject: [PATCH] Do not launch a quick viewer unless it's whitelisted. Bug: 26697917 Change-Id: Ibe2c7c462380c219d6ce5b5c69af6dac0df62d41 --- .../documentsui/QuickViewIntentBuilder.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java index 5a80c393646ea..454316214573b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java +++ b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java @@ -72,18 +72,12 @@ final class QuickViewIntentBuilder { String trustedPkg = mResources.getString(R.string.trusted_quick_viewer_package); - Intent intent = new Intent(Intent.ACTION_QUICK_VIEW); - intent.setDataAndType(mDocument.derivedUri, mDocument.mimeType); - intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - - if (TextUtils.isEmpty(trustedPkg)) { - if (hasRegisteredHandler(intent)) { - return intent; - } - } else { + if (!TextUtils.isEmpty(trustedPkg)) { + Intent intent = new Intent(Intent.ACTION_QUICK_VIEW); + intent.setDataAndType(mDocument.derivedUri, mDocument.mimeType); + intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setPackage(trustedPkg); if (hasRegisteredHandler(intent)) { - // We have a trusted handler. Load all of the docs into the intent. Cursor cursor = mSiblings.getCursor(); for (int i = 0; i < cursor.getCount(); i++) { onNextItem(i, cursor);