From e60b28d99b7f541616a4f26d476ae452cdfe41e2 Mon Sep 17 00:00:00 2001
From: Thierry Strudel <tstrudel@google.com>
Date: Thu, 25 Feb 2016 02:14:16 +0000
Subject: [PATCH] Revert "Temporary fix for QXDM crashes."

This reverts commit d7793693ad6b8937bb7850573278b881618795b0.

Change-Id: I9f27d6d5075be7b170ebe7a5bf4f2c3fe8c7c604
---
 core/java/android/app/ActivityThread.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1aa43215ad340..02b94de925091 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4945,11 +4945,7 @@ public final class ActivityThread {
          * This is what ultimately throws {@link FileUriExposedException}.
          */
         if (data.appInfo.targetSdkVersion >= Build.VERSION_CODES.N) {
-            if ("com.android.qxdmlogger".equals(data.appInfo.packageName)) {
-                // STOPSHIP: Fix security on this logger tool
-            } else {
-                StrictMode.enableDeathOnFileUriExposure();
-            }
+            StrictMode.enableDeathOnFileUriExposure();
         }
 
         NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(