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

Commit 44063d75 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Address followup comments from 793838."

parents 2cce579e 1eafb666

packages/DocumentsUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -334,12 +334,12 @@ public class FilesActivity extends BaseActivity { 
                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);

packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ final class QuickViewIntentBuilder { 
                intent.setClipData(mClipData);



                return intent;

            } else {

                Log.e(TAG, "Can't resolve trusted quick view package: " + trustedPkg);

            }

        }