Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't log BlockGuard violations on ENG builds."

Browse Source
This commit is contained in:
Jeff Brown
2011-10-11 12:35:05 -07:00
committed by Android (Google) Code Review
parent b545851dd5 be7c29c9f7
commit e69eaf5c6d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/StrictMode.java
View File

@@ -35,7 +35,6 @@ import dalvik.system.VMDebug;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -902,15 +901,13 @@ public final class StrictMode {
return false; return false;
} }
// Thread policy controls BlockGuard.
int threadPolicyMask = StrictMode.DETECT_DISK_WRITE | int threadPolicyMask = StrictMode.DETECT_DISK_WRITE |
StrictMode.DETECT_DISK_READ | StrictMode.DETECT_DISK_READ |
StrictMode.DETECT_NETWORK; StrictMode.DETECT_NETWORK;
if (!IS_USER_BUILD) { if (!IS_USER_BUILD) {
threadPolicyMask |= StrictMode.PENALTY_DROPBOX; threadPolicyMask |= StrictMode.PENALTY_DROPBOX;
if (IS_ENG_BUILD) {
threadPolicyMask |= StrictMode.PENALTY_LOG;
}
} }
if (doFlashes) { if (doFlashes) {
threadPolicyMask |= StrictMode.PENALTY_FLASH; threadPolicyMask |= StrictMode.PENALTY_FLASH;
@@ -918,6 +915,8 @@ public final class StrictMode {
StrictMode.setThreadPolicyMask(threadPolicyMask); StrictMode.setThreadPolicyMask(threadPolicyMask);
// VM Policy controls CloseGuard, detection of Activity leaks,
// and instance counting.
if (IS_USER_BUILD) { if (IS_USER_BUILD) {
setCloseGuardEnabled(false); setCloseGuardEnabled(false);
} else { } else {