| commit | 44063d7559d10a42b1637ca1a56873a5cb6ee223 | [log] [tgz] |
|---|---|---|
| author | Steve McKay <smckay@google.com> | Mon Oct 26 20:51:09 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 26 20:51:09 2015 +0000 |
| tree | a095402bf8c88d8d0cf90d249a99c9ac3e877751 | |
| parent | 2cce579ed234711bbffb4ec0181c0e7bc4f4805b [diff] | |
| parent | 1eafb666c24736be4454c199a62c256c55e86bc4 [diff] |
Merge "Address followup comments from 793838."
diff --git a/packages/DocumentsUI/res/values/config.xml b/packages/DocumentsUI/res/values/config.xml index 73538278..ad419aa 100644 --- a/packages/DocumentsUI/res/values/config.xml +++ b/packages/DocumentsUI/res/values/config.xml
@@ -16,6 +16,6 @@ <resources> <bool name="productivity_device">true</bool> - <!-- intentionally unset. Vendors should set this in an overlay. --> + <!-- Intentionally unset. Vendors should set this in an overlay. --> <string name="trusted_quick_viewer_package"></string> </resources>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index 3b985ec..627ba75 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
@@ -334,12 +334,12 @@ startActivity(intent); return; } catch (SecurityException e) { - // carry on to regular view mode. + // Carry on to regular view mode. Log.e(TAG, "Caught security error: " + e.getLocalizedMessage()); } } - // fallback to traditional VIEW action... + // Fallback to traditional VIEW action... intent = new Intent(Intent.ACTION_VIEW); intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setData(doc.derivedUri);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java index 6a424a6..605c530 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java +++ b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
@@ -92,6 +92,8 @@ intent.setClipData(mClipData); return intent; + } else { + Log.e(TAG, "Can't resolve trusted quick view package: " + trustedPkg); } }