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

Commit 2aa8cd1d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix permissions for internal links." am: 24f45fbd am: e194aa42 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455



Change-Id: Ib7211f190336de2c318f117ebe2ab71ed5b35062
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb4dc0b1 e194aa42

src/com/android/settings/SettingsLicenseActivity.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,9 @@ public class SettingsLicenseActivity extends FragmentActivity implements 
        intent.setDataAndType(uri, "text/html");

        intent.setDataAndType(uri, "text/html");

        intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_license_activity_title));

        intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_license_activity_title));

        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {

        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

            intent.addFlags(

                    Intent.FLAG_GRANT_READ_URI_PERMISSION

                            | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);

        }

        }

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.setPackage("com.android.htmlviewer");

        intent.setPackage("com.android.htmlviewer");

tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,8 @@ public class SettingsLicenseActivityTest { 
                "text/html");

                "text/html");

        intent.putExtra(Intent.EXTRA_TITLE, mActivity.getString(

        intent.putExtra(Intent.EXTRA_TITLE, mActivity.getString(

                R.string.settings_license_activity_title));

                R.string.settings_license_activity_title));

        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        intent.addFlags(

                Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.setPackage("com.android.htmlviewer");

        intent.setPackage("com.android.htmlviewer");