Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the definition of noDefaultNetwork and noValidatedNetwork" into sc-dev am: 144d78e795

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14720121

Change-Id: Idedfb2b5ada2ec17721f11728555ffc20823a88c
This commit is contained in:
TreeHugger Robot
2021-05-26 17:21:49 +00:00
committed by Automerger Merge Worker
parent 7e326edecc 144d78e795
commit 2b436ae2e6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -1023,6 +1023,11 @@ public class NetworkControllerImpl extends BroadcastReceiver
mValidatedTransports.clear(); mValidatedTransports.clear();
if (mLastDefaultNetworkCapabilities != null) { if (mLastDefaultNetworkCapabilities != null) {
for (int transportType : mLastDefaultNetworkCapabilities.getTransportTypes()) { for (int transportType : mLastDefaultNetworkCapabilities.getTransportTypes()) {
if (transportType != NetworkCapabilities.TRANSPORT_CELLULAR
&& transportType != NetworkCapabilities.TRANSPORT_WIFI
&& transportType != NetworkCapabilities.TRANSPORT_ETHERNET) {
continue;
}
if (transportType == NetworkCapabilities.TRANSPORT_CELLULAR if (transportType == NetworkCapabilities.TRANSPORT_CELLULAR
&& Utils.tryGetWifiInfoForVcn(mLastDefaultNetworkCapabilities) != null) { && Utils.tryGetWifiInfoForVcn(mLastDefaultNetworkCapabilities) != null) {
mConnectedTransports.set(NetworkCapabilities.TRANSPORT_WIFI); mConnectedTransports.set(NetworkCapabilities.TRANSPORT_WIFI);
@@ -1045,11 +1050,15 @@ public class NetworkControllerImpl extends BroadcastReceiver
Log.d(TAG, "updateConnectivity: mValidatedTransports=" + mValidatedTransports); Log.d(TAG, "updateConnectivity: mValidatedTransports=" + mValidatedTransports);
} }
mInetCondition = !mValidatedTransports.isEmpty(); mInetCondition = mValidatedTransports.get(NetworkCapabilities.TRANSPORT_CELLULAR)
|| mValidatedTransports.get(NetworkCapabilities.TRANSPORT_WIFI)
|| mValidatedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET);
pushConnectivityToSignals(); pushConnectivityToSignals();
if (mProviderModel) { if (mProviderModel) {
mNoDefaultNetwork = mConnectedTransports.isEmpty(); mNoDefaultNetwork = !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_CELLULAR)
&& !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_WIFI)
&& !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET);
mCallbackHandler.setConnectivityStatus(mNoDefaultNetwork, !mInetCondition, mCallbackHandler.setConnectivityStatus(mNoDefaultNetwork, !mInetCondition,
mNoNetworksAvailable); mNoNetworksAvailable);
for (int i = 0; i < mMobileSignalControllers.size(); i++) { for (int i = 0; i < mMobileSignalControllers.size(); i++) {