Merge "Temporary fix for QXDM crashes." into nyc-dev

am: 2f457f470c * commit '2f457f470cd260f07ab481ab6fb3cad143f9a958': Temporary fix for QXDM crashes.
2016-02-24 21:29:17 +00:00
parent 03ae05b095 2f457f470c
commit aedb89b0c5
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4956,7 +4956,11 @@ public final class ActivityThread {
         * This is what ultimately throws {@link FileUriExposedException}.
         */
        if (data.appInfo.targetSdkVersion >= Build.VERSION_CODES.N) {
-            StrictMode.enableDeathOnFileUriExposure();
+            if ("com.android.qxdmlogger".equals(data.appInfo.packageName)) {
+                // STOPSHIP: Fix security on this logger tool
+            } else {
+                StrictMode.enableDeathOnFileUriExposure();
+            }
        }

        NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(