From 11411e187bd52b0a2d01e5084207d401ae32f471 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 10 Aug 2022 10:57:54 -0700 Subject: [PATCH] Fix permissions for internal links. Test: m droid dist Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc --- src/com/android/settings/SettingsLicenseActivity.java | 4 +++- .../src/com/android/settings/SettingsLicenseActivityTest.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index 57b1f5c6cbb..598c97394c1 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -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"); diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index e98ca311598..6b00255f3af 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -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");