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

Commit 24f45fbd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix permissions for internal links."

parents 3bd3f983 11411e18

src/com/android/settings/SettingsLicenseActivity.java

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

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

        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.setPackage("com.android.htmlviewer");

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

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

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

                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.setPackage("com.android.htmlviewer");