Merge changes from topic 'ipsec-merge-conflicts' into oc-dev-plus-aosp (51a93ada) · Commits · e / os / android_frameworks_base

services/java/com/android/server/SystemServer.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -1696,19 +1696,19 @@ public final class SystemServer {
		} catch (Throwable e) {
		reportWtf("making Network Managment Service ready", e);
		}
		Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "MakeIpSecServiceReady");
		try {
		if (ipSecServiceF != null) ipSecServiceF.systemReady();
		} catch (Throwable e) {
		reportWtf("making IpSec Service ready", e);
		}
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
		CountDownLatch networkPolicyInitReadySignal = null;
		if (networkPolicyF != null) {
		networkPolicyInitReadySignal = networkPolicyF
		.networkScoreAndNetworkManagementServiceReady();
		}
		traceEnd();
		traceBeginAndSlog("MakeIpSecServiceReady");
		try {
		if (ipSecServiceF != null) ipSecServiceF.systemReady();
		} catch (Throwable e) {
		reportWtf("making IpSec Service ready", e);
		}
		traceEnd();
		traceBeginAndSlog("MakeNetworkStatsServiceReady");
		try {
		if (networkStatsF != null) networkStatsF.systemReady();