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

Merge "Disable activity leak detection by default for userdebug" into oc-dev

Browse Source 
am: 956ea5f09d

Change-Id: Iadacd64e92c1963b2417bad96838ba2c128ec8cb
This commit is contained in:
Mathieu Chartier
2017-06-20 20:05:29 +00:00
committed by android-build-merger
parent 2c34b5bf55 956ea5f09d
commit 8d189593b8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -936,6 +936,11 @@ public final class StrictMode {
return this;
}
Builder disable(int bit) {
mMask &= ~bit;
return this;
}
/**
* Construct the VmPolicy instance.
*
@@ -1214,7 +1219,13 @@ public final class StrictMode {
if (IS_USER_BUILD) {
setCloseGuardEnabled(false);
} else {
VmPolicy.Builder policyBuilder = new VmPolicy.Builder().detectAll().penaltyDropBox();
VmPolicy.Builder policyBuilder = new VmPolicy.Builder().detectAll();
if (!IS_ENG_BUILD) {
// Activity leak detection causes too much slowdown for userdebug because of the
// GCs.
policyBuilder = policyBuilder.disable(DETECT_VM_ACTIVITY_LEAKS);
}
policyBuilder = policyBuilder.penaltyDropBox();
if (IS_ENG_BUILD) {
policyBuilder.penaltyLog();
}