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

am 48731318: Merge "Always log StrictMode violations on ENG builds."

Browse Source 
* commit '4873131858a78708d42ffbdae0753c1bcd04d46f':
  Always log StrictMode violations on ENG builds.
This commit is contained in:
Jeff Brown
2011-10-10 11:51:34 -07:00
committed by Android Git Automerger
parent 10628ccc66 4873131858
commit 5ae0810722
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/os/StrictMode.java
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;