Merge "Get the instance count as the initial value" into rvc-dev (d5fb11a7) · Commits · e / os / android_frameworks_base

core/java/android/os/StrictMode.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -817,6 +817,9 @@ public final class StrictMode {

		/** @hide */
		public @NonNull Builder permitActivityLeaks() {
		synchronized (StrictMode.class) {
		sExpectedActivityInstanceCount.clear();
		}
		return disable(DETECT_VM_ACTIVITY_LEAKS);
		}

		@@ -2586,8 +2589,10 @@ public final class StrictMode {
		return;
		}

		// Use the instance count from InstanceTracker as initial value.
		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);
		}
		}