Merge "Always log StrictMode violations on ENG builds."

This commit is contained in:
Jeff Brown
2011-10-10 11:48:53 -07:00
committed by Android (Google) Code Review

View File

@@ -908,6 +908,9 @@ public final class StrictMode {
if (!IS_USER_BUILD) {
threadPolicyMask |= StrictMode.PENALTY_DROPBOX;
if (IS_ENG_BUILD) {
threadPolicyMask |= StrictMode.PENALTY_LOG;
}
}
if (doFlashes) {
threadPolicyMask |= StrictMode.PENALTY_FLASH;
@@ -918,7 +921,11 @@ public final class StrictMode {
if (IS_USER_BUILD) {
setCloseGuardEnabled(false);
} else {
setVmPolicy(new VmPolicy.Builder().detectAll().penaltyDropBox().build());
VmPolicy.Builder policyBuilder = new VmPolicy.Builder().detectAll().penaltyDropBox();
if (IS_ENG_BUILD) {
policyBuilder.penaltyLog();
}
setVmPolicy(policyBuilder.build());
setCloseGuardEnabled(vmClosableObjectLeaksEnabled());
}
return true;