From a806f2bff4c5494eb74348fafa3f1b8d4d4edc7f Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 28 Jan 2016 19:03:18 -0700 Subject: [PATCH] Temporary hack to keep file:// Uris working. Bug: 26860922 Change-Id: I29cc4f4328b829e75a4523bd4d710da3e872f59c --- src/com/android/settings/SettingsLicenseActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index 52b48bb499d..aa2e8ddc973 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -21,6 +21,7 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.os.StrictMode; import android.os.SystemProperties; import android.text.TextUtils; import android.util.Log; @@ -65,11 +66,14 @@ public class SettingsLicenseActivity extends Activity { intent.setPackage("com.android.htmlviewer"); try { + StrictMode.disableDeathOnFileUriExposure(); startActivity(intent); finish(); } catch (ActivityNotFoundException e) { Log.e(TAG, "Failed to find viewer", e); showErrorAndFinish(); + } finally { + StrictMode.enableDeathOnFileUriExposure(); } }