Merge "Cleanup SystemReady in the network stack" am: e0ef7ce4f7 am: 4b130e8567 (d5f7c8c2) · Commits · e / os / android_packages_modules_NetworkStack

src/com/android/server/NetworkStackService.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -302,12 +302,6 @@ public class NetworkStackService extends Service {
		mNm.notifyDnsResponse(returnCode);
		}

		@Override
		public void notifySystemReady() {
		checkNetworkStackCallingPermission();
		mNm.notifySystemReady();
		}

		@Override
		public void notifyNetworkConnected(LinkProperties lp, NetworkCapabilities nc) {
		checkNetworkStackCallingPermission();

+0 −15

Original line number	Diff line number	Diff line
		@@ -298,8 +298,6 @@ public class NetworkMonitor extends StateMachine {
		// Avoids surfacing "Sign in to network" notification.
		private boolean mDontDisplaySigninNotification = false;

		private volatile boolean mSystemReady = false;

		private final State mDefaultState = new DefaultState();
		private final State mValidatedState = new ValidatedState();
		private final State mMaybeNotifyState = new MaybeNotifyState();
		@@ -433,15 +431,6 @@ public class NetworkMonitor extends StateMachine {
		sendMessage(CMD_PRIVATE_DNS_SETTINGS_CHANGED, newCfg);
		}

		/**
		* Send a notification to NetworkMonitor indicating that the system is ready.
		*/
		public void notifySystemReady() {
		// No need to run on the handler thread: mSystemReady is volatile and read only once on the
		// isCaptivePortal() thread.
		mSystemReady = true;
		}

		/**
		* Send a notification to NetworkMonitor indicating that the network is now connected.
		*/
		@@ -1592,10 +1581,6 @@ public class NetworkMonitor extends StateMachine {
		*/
		private void sendNetworkConditionsBroadcast(boolean responseReceived, boolean isCaptivePortal,
		long requestTimestampMs, long responseTimestampMs) {
		if (!mSystemReady) {
		return;
		}

		Intent latencyBroadcast =
		new Intent(NetworkMonitorUtils.ACTION_NETWORK_CONDITIONS_MEASURED);
		if (mNetworkCapabilities.hasTransport(TRANSPORT_WIFI)) {