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

Merge "Keep the merged WiFi indicators when WiFi toggle changes." into sc-v2-dev am: c4392736ae

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

Change-Id: I188c4dc31e310ea187609513fad95f1321b6b89b
This commit is contained in:
TreeHugger Robot
2021-12-06 21:06:41 +00:00
committed by Automerger Merge Worker
parent 5768697168 c4392736ae
commit 8d974c624e
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,8 +261,6 @@ public class WifiStatusTracker {
private void updateWifiState() { private void updateWifiState() {
state = mWifiManager.getWifiState(); state = mWifiManager.getWifiState();
enabled = state == WifiManager.WIFI_STATE_ENABLED; enabled = state == WifiManager.WIFI_STATE_ENABLED;
isCarrierMerged = false;
subId = 0;
} }
private void updateRssi(int newRssi) { private void updateRssi(int newRssi) {

2
packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java
View File

@@ -83,7 +83,7 @@ public class WifiSignalController extends SignalController<WifiState, IconGroup>
@Override @Override
public void notifyListeners(SignalCallback callback) { public void notifyListeners(SignalCallback callback) {
if (mCurrentState.isCarrierMerged) { if (mCurrentState.isCarrierMerged) {
if (mCurrentState.isDefault) { if (mCurrentState.isDefault || !mNetworkController.isRadioOn()) {
notifyListenersForCarrierWifi(callback); notifyListenersForCarrierWifi(callback);
} }
} else { } else {

15
packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java
View File

@@ -268,6 +268,21 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
} }
} }
@Test
public void testDisableWiFiWithVcnWithUnderlyingWifi() {
String testSsid = "Test VCN SSID";
setWifiEnabled(true);
verifyLastWifiIcon(false, WifiIcons.WIFI_NO_NETWORK);
mNetworkController.setNoNetworksAvailable(false);
setWifiStateForVcn(true, testSsid);
setWifiLevelForVcn(1);
verifyLastMobileDataIndicatorsForVcn(true, 1, TelephonyIcons.ICON_CWF, false);
setWifiEnabled(false);
verifyLastMobileDataIndicatorsForVcn(false, 1, 0, false);
}
@Test @Test
public void testCallStrengh() { public void testCallStrengh() {
if (true) return; if (true) return;