Merge "StrictMode: shut up VM penalty logging on debug builds."
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index 1fa5af2..93542c6e 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -706,8 +706,7 @@
StrictMode.PENALTY_DROPBOX);
sVmPolicyMask = StrictMode.DETECT_VM_CURSOR_LEAKS |
StrictMode.DETECT_VM_CLOSABLE_LEAKS |
- StrictMode.PENALTY_DROPBOX |
- StrictMode.PENALTY_LOG;
+ StrictMode.PENALTY_DROPBOX;
setCloseGuardEnabled(vmClosableObjectLeaksEnabled());
return true;
}