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

2016-02-25 02:16:49 +00:00
parent 5099cca93d e60b28d99b
commit 0601a1c670
1 changed files with 1 additions and 5 deletions
--- 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(