Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java |
index 93cc3d1820798c101be5eea839a71ba72c0d1787..94fcafc5fcf141f2f656fac309d2cb3922c20eb5 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java |
@@ -127,7 +127,7 @@ public class ChromeStrictMode { |
private static void turnOnDetection(StrictMode.ThreadPolicy.Builder threadPolicy, |
StrictMode.VmPolicy.Builder vmPolicy) { |
threadPolicy.detectAll(); |
- if (Build.VERSION.CODENAME.equals("N")) { |
+ if (Build.VERSION.CODENAME.equals("N") || Build.VERSION.SDK_INT > Build.VERSION_CODES.M) { |
vmPolicy.detectAll(); |
} else { |
// Explicitly enable detection of all violations except file URI leaks, as that |