Merge "Add trimMemory level to traces" (e02d3f03) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+15 −10

Original line number	Diff line number	Diff line
		@@ -6426,9 +6426,12 @@ public final class ActivityThread extends ClientTransactionHandler
		}

		private void handleTrimMemory(int level) {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "trimMemory");
		if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "trimMemory: " + level);
		}
		if (DEBUG_MEMORY_TRIM) Slog.v(TAG, "Trimming memory to level: " + level);

		try {
		if (level >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) {
		PropertyInvalidatedCache.onTrimMemory();
		}
		@@ -6440,9 +6443,11 @@ public final class ActivityThread extends ClientTransactionHandler
		for (int i = 0; i < N; i++) {
		callbacks.get(i).onTrimMemory(level);
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}

		WindowManagerGlobal.getInstance().trimMemory(level);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

		if (SystemProperties.getInt("debug.am.run_gc_trim_level", Integer.MAX_VALUE) <= level) {
		unscheduleGcIdler();