diff options
| author | 2016-02-24 21:16:33 +0000 | |
|---|---|---|
| committer | 2016-02-24 21:16:35 +0000 | |
| commit | 2f457f470cd260f07ab481ab6fb3cad143f9a958 (patch) | |
| tree | d8640086736645ca0f3d3dabc3604205e30b5c3c | |
| parent | fe939916a6d9bd092b782e6fd21856b574467d88 (diff) | |
| parent | d7793693ad6b8937bb7850573278b881618795b0 (diff) | |
Merge "Temporary fix for QXDM crashes." into nyc-dev
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 02b94de92509..1aa43215ad34 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4945,7 +4945,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( |