Clean up log spam (ddee2819) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/NetworkTypeController.java

+20 −34

Original line number	Original line	Diff line number	Diff line
	@@ -247,37 +247,27 @@ public class NetworkTypeController extends StateMachine {
	private final ConnectivityManager.NetworkCallback mNetworkCallback =		private final ConnectivityManager.NetworkCallback mNetworkCallback =
	new ConnectivityManager.NetworkCallback() {		new ConnectivityManager.NetworkCallback() {
	@Override		@Override
	public void onAvailable(Network network) {		public void onAvailable(@NonNull Network network) {
	log("On Available: " + network);
	if (network != null) {
	if (mConnectivityManager != null) {		if (mConnectivityManager != null) {
	NetworkCapabilities capabilities =		NetworkCapabilities capabilities =
	mConnectivityManager.getNetworkCapabilities(network);		mConnectivityManager.getNetworkCapabilities(network);
	updateBandwidthConstrainedStatus(capabilities);		if (capabilities != null) {
	} else {		updateBandwidthConstrainedStatus(
	log("network is null");		isBandwidthConstrainedCapabilitySupported(capabilities));
	}		}
	}		}
	}		}

	@Override		@Override
	public void onCapabilitiesChanged(Network network,		public void onCapabilitiesChanged(@NonNull Network network,
	NetworkCapabilities networkCapabilities) {		@NonNull NetworkCapabilities networkCapabilities) {
	log("onCapabilitiesChanged: " + network);		updateBandwidthConstrainedStatus(
	if (network != null) {		isBandwidthConstrainedCapabilitySupported(networkCapabilities));
	updateBandwidthConstrainedStatus(networkCapabilities);
	} else {
	log("network is null");
	}
	}		}

	@Override		@Override
	public void onLost(Network network) {		public void onLost(@NonNull Network network) {
	log("Network Lost");		updateBandwidthConstrainedStatus(false);
	if (mIsSatelliteConstrainedData) {
	mIsSatelliteConstrainedData = false;
	mDisplayInfoController.updateTelephonyDisplayInfo();
	}
	}		}
	};		};

	@@ -296,17 +286,13 @@ public class NetworkTypeController extends StateMachine {
	}		}
	}		}

	private void updateBandwidthConstrainedStatus(NetworkCapabilities capabilities) {		private void updateBandwidthConstrainedStatus(boolean isConstrained) {
	if (capabilities != null) {
	boolean isConstrained = isBandwidthConstrainedCapabilitySupported(capabilities);
	if (isConstrained != mIsSatelliteConstrainedData) {		if (isConstrained != mIsSatelliteConstrainedData) {
	mIsSatelliteConstrainedData = isConstrained;		mIsSatelliteConstrainedData = isConstrained;
	log("Update network type because satellite constrained data status changed to "		log("Reset timers because satellite constrained data status changed to "
	+ mIsSatelliteConstrainedData);		+ mIsSatelliteConstrainedData);
	mDisplayInfoController.updateTelephonyDisplayInfo();		resetAllTimers();
	}		transitionToCurrentState();
	} else {
	log("capabilities is null");
	}		}
	}		}