Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev (0601a1c6) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -4945,12 +4945,8 @@ 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();
		}
		}

		NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(
		(data.appInfo.flags & ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC) != 0);