Merge "Fix permissions for internal links."
This commit is contained in:
@@ -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");
|
||||||
|
@@ -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");
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user