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

Merge "Display W+ icon following carrier config" into sc-qpr1-dev am: 98de93009e am: 688cc24c51 am: 0b9f154ff7

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

Change-Id: Icf5e03594370fc5194a13b875afe1ac2fd61bbcb
This commit is contained in:
Xi Han
2021-08-19 16:36:39 +00:00
committed by Automerger Merge Worker
parent e3ebae48e2 0b9f154ff7
commit abdf4c7524
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -157,7 +157,6 @@ public class WifiStatusTracker {
private Network mDefaultNetwork = null;
private NetworkCapabilities mDefaultNetworkCapabilities = null;
private final Runnable mCallback;
private final boolean mSupportMergedUi;
private WifiInfo mWifiInfo;
public boolean enabled;
@@ -181,7 +180,6 @@ public class WifiStatusTracker {
mNetworkScoreManager = networkScoreManager;
mConnectivityManager = connectivityManager;
mCallback = callback;
mSupportMergedUi = false;
}
public void setListening(boolean listening) {
@@ -223,10 +221,8 @@ public class WifiStatusTracker {
} else {
ssid = getValidSsid(mWifiInfo);
}
if (mSupportMergedUi) {
isCarrierMerged = mWifiInfo.isCarrierMerged();
subId = mWifiInfo.getSubscriptionId();
}
isCarrierMerged = mWifiInfo.isCarrierMerged();
subId = mWifiInfo.getSubscriptionId();
updateRssi(mWifiInfo.getRssi());
maybeRequestNetworkScore();
}
@@ -255,10 +251,8 @@ public class WifiStatusTracker {
} else {
ssid = getValidSsid(mWifiInfo);
}
if (mSupportMergedUi) {
isCarrierMerged = mWifiInfo.isCarrierMerged();
subId = mWifiInfo.getSubscriptionId();
}
isCarrierMerged = mWifiInfo.isCarrierMerged();
subId = mWifiInfo.getSubscriptionId();
updateRssi(mWifiInfo.getRssi());
maybeRequestNetworkScore();
}

6
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java
View File

@@ -238,7 +238,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
mNetworkController.setNoNetworksAvailable(false);
setWifiStateForVcn(true, testSsid);
setWifiLevelForVcn(0);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][0]);
verifyLastMobileDataIndicatorsForVcn(true, 0, TelephonyIcons.ICON_CWF, false);
mNetworkController.setNoNetworksAvailable(true);
for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) {
@@ -246,11 +246,11 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
setConnectivityViaCallbackInNetworkControllerForVcn(
NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]);
verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, true);
setConnectivityViaCallbackInNetworkControllerForVcn(
NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]);
verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, false);
}
}