Merge "Update internet data state when capabilities change" (2d968b6d) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/DataNetworkController.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -3168,6 +3168,12 @@ public class DataNetworkController extends Handler {
		log("Found more network requests that can be satisfied. " + networkRequestList);
		dataNetwork.attachNetworkRequests(networkRequestList);
		}

		if (dataNetwork.getNetworkCapabilities().hasCapability(
		NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
		// Update because DataNetwork#isInternetSupported might have changed with capabilities.
		updateOverallInternetDataState();
		}
		}

		/**
		@@ -3318,9 +3324,9 @@ public class DataNetworkController extends Handler {
		}

		/**
		* Update the internet data network state. For now only {@link TelephonyManager#DATA_CONNECTED}
		* , {@link TelephonyManager#DATA_SUSPENDED}, and
		* {@link TelephonyManager#DATA_DISCONNECTED} are supported.
		* Update the internet data network state. For now only {@link TelephonyManager#DATA_CONNECTED},
		* {@link TelephonyManager#DATA_SUSPENDED}, and {@link TelephonyManager#DATA_DISCONNECTED}
		* are supported.
		*/
		private void updateOverallInternetDataState() {
		boolean anyInternetConnected = mDataNetworkList.stream()
		@@ -3588,8 +3594,8 @@ public class DataNetworkController extends Handler {

		/**
		* Get the internet data network state. Note that this is the best effort if more than one
		* data network supports internet. For now only {@link TelephonyManager#DATA_CONNECTED}
		* , {@link TelephonyManager#DATA_SUSPENDED}, and {@link TelephonyManager#DATA_DISCONNECTED}
		* data network supports internet. For now only {@link TelephonyManager#DATA_CONNECTED},
		* {@link TelephonyManager#DATA_SUSPENDED}, and {@link TelephonyManager#DATA_DISCONNECTED}
		* are supported.
		*
		* @return The data network state.