summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-11-17 19:27:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-17 19:27:29 -0800
commit85a395dce0f8f70b29361d58a2a7c8c3e52dab4e (patch)
treef4d9b0aeab28499c42d1d8ef5544246ddf0b6d15
parent691da62bfeed0c00df82aa495d3510c134cbac8a (diff)
parentd188ededa6f61dbe5a700e81db22c02478ce60cc (diff)
downloadframeworks_base-85a395dce0f8f70b29361d58a2a7c8c3e52dab4e.zip
frameworks_base-85a395dce0f8f70b29361d58a2a7c8c3e52dab4e.tar.gz
frameworks_base-85a395dce0f8f70b29361d58a2a7c8c3e52dab4e.tar.bz2
Merge "StrictMode: shut up VM penalty logging on debug builds."
-rw-r--r--core/java/android/os/StrictMode.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index 1fa5af2..93542c6 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -706,8 +706,7 @@ public final class StrictMode {
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;
}