Merge "Temporary hack to keep file:// Uris working."

2016-01-29 02:43:31 +00:00
parent 9329fd7a39 a806f2bff4
commit a14dac2c8f
1 changed files with 4 additions and 0 deletions
--- 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();
        }
    }