Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev am: 0601a1c670

am: 6f5d54ebef

* commit '6f5d54ebef08da95003b4e79d3e4d4ab20c0a06c':
  Revert "Temporary fix for QXDM crashes."
This commit is contained in:
Thierry Strudel
2016-02-25 02:39:29 +00:00
committed by android-build-merger

View File

@@ -4956,11 +4956,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(