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

Merge "Get the instance count as the initial value" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-05 03:34:32 +00:00
committed by Android (Google) Code Review
parent cf3a8611d0 762f0493ca
commit d5fb11a761
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -817,6 +817,9 @@ public final class StrictMode {
/** @hide */ /** @hide */
public @NonNull Builder permitActivityLeaks() { public @NonNull Builder permitActivityLeaks() {
synchronized (StrictMode.class) {
sExpectedActivityInstanceCount.clear();
}
return disable(DETECT_VM_ACTIVITY_LEAKS); return disable(DETECT_VM_ACTIVITY_LEAKS);
} }
@@ -2586,8 +2589,10 @@ public final class StrictMode {
return; return;
} }
// Use the instance count from InstanceTracker as initial value.
Integer expected = sExpectedActivityInstanceCount.get(klass); Integer expected = sExpectedActivityInstanceCount.get(klass);
Integer newExpected = expected == null ? 1 : expected + 1; Integer newExpected =
expected == null ? InstanceTracker.getInstanceCount(klass) + 1 : expected + 1;
sExpectedActivityInstanceCount.put(klass, newExpected); sExpectedActivityInstanceCount.put(klass, newExpected);
} }
} }