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

Browse Source
This commit is contained in:
Xi Han
2021-08-19 16:09:02 +00:00
committed by Android (Google) Code Review
parent 0e40c2c994 fac117c901
commit 98de93009e
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 Network mDefaultNetwork = null;
private NetworkCapabilities mDefaultNetworkCapabilities = null; private NetworkCapabilities mDefaultNetworkCapabilities = null;
private final Runnable mCallback; private final Runnable mCallback;
private final boolean mSupportMergedUi;
private WifiInfo mWifiInfo; private WifiInfo mWifiInfo;
public boolean enabled; public boolean enabled;
@@ -181,7 +180,6 @@ public class WifiStatusTracker {
mNetworkScoreManager = networkScoreManager; mNetworkScoreManager = networkScoreManager;
mConnectivityManager = connectivityManager; mConnectivityManager = connectivityManager;
mCallback = callback; mCallback = callback;
mSupportMergedUi = false;
} }
public void setListening(boolean listening) { public void setListening(boolean listening) {
@@ -223,10 +221,8 @@ public class WifiStatusTracker {
} else { } else {
ssid = getValidSsid(mWifiInfo); ssid = getValidSsid(mWifiInfo);
} }
if (mSupportMergedUi) { isCarrierMerged = mWifiInfo.isCarrierMerged();
isCarrierMerged = mWifiInfo.isCarrierMerged(); subId = mWifiInfo.getSubscriptionId();
subId = mWifiInfo.getSubscriptionId();
}
updateRssi(mWifiInfo.getRssi()); updateRssi(mWifiInfo.getRssi());
maybeRequestNetworkScore(); maybeRequestNetworkScore();
} }
@@ -255,10 +251,8 @@ public class WifiStatusTracker {
} else { } else {
ssid = getValidSsid(mWifiInfo); ssid = getValidSsid(mWifiInfo);
} }
if (mSupportMergedUi) { isCarrierMerged = mWifiInfo.isCarrierMerged();
isCarrierMerged = mWifiInfo.isCarrierMerged(); subId = mWifiInfo.getSubscriptionId();
subId = mWifiInfo.getSubscriptionId();
}
updateRssi(mWifiInfo.getRssi()); updateRssi(mWifiInfo.getRssi());
maybeRequestNetworkScore(); 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); mNetworkController.setNoNetworksAvailable(false);
setWifiStateForVcn(true, testSsid); setWifiStateForVcn(true, testSsid);
setWifiLevelForVcn(0); setWifiLevelForVcn(0);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][0]); verifyLastMobileDataIndicatorsForVcn(true, 0, TelephonyIcons.ICON_CWF, false);
mNetworkController.setNoNetworksAvailable(true); mNetworkController.setNoNetworksAvailable(true);
for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) {
@@ -246,11 +246,11 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
setConnectivityViaCallbackInNetworkControllerForVcn( setConnectivityViaCallbackInNetworkControllerForVcn(
NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo); NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, true);
setConnectivityViaCallbackInNetworkControllerForVcn( setConnectivityViaCallbackInNetworkControllerForVcn(
NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo); NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]); verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, false);
} }
} }