Fix conditionally-imbalanced traceEnd (9f85bd9d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/OomAdjuster.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -498,7 +498,8 @@ public class OomAdjuster {
		// Skip setting the process group for system_server, keep it as default.
		return true;
		}
		if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
		final boolean traceEnabled = Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		if (traceEnabled) {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "setProcessGroup "
		+ msg.obj + " to " + group);
		}
		@@ -509,8 +510,10 @@ public class OomAdjuster {
		Slog.w(TAG, "Failed setting process group of " + pid + " to " + group, e);
		}
		} finally {
		if (traceEnabled) {
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}
		}
		return true;
		});
		mTmpUidRecords = new ActiveUids(service, false);