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

Merge "Fix WiFi + "x" stil visible" into rvc-d1-dev

Browse Source
This commit is contained in:
Etan Cohen
2020-08-14 18:25:34 +00:00
committed by Android (Google) Code Review
parent ba354cf97c 57855efc38
commit a270a22a23
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,10 +189,12 @@ public class WifiStatusTracker {
}
}
updateStatusLabel();
mCallback.run();
} else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
// Default to -200 as its below WifiManager.MIN_RSSI.
updateRssi(intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200));
updateStatusLabel();
mCallback.run();
}
}
@@ -215,13 +217,15 @@ public class WifiStatusTracker {
private void updateStatusLabel() {
NetworkCapabilities networkCapabilities;
final Network currentWifiNetwork = mWifiManager.getCurrentNetwork();
if (currentWifiNetwork != null && currentWifiNetwork.equals(mDefaultNetwork)) {
isDefaultNetwork = false;
if (mDefaultNetworkCapabilities != null) {
isDefaultNetwork = mDefaultNetworkCapabilities.hasTransport(
NetworkCapabilities.TRANSPORT_WIFI);
}
if (isDefaultNetwork) {
// Wifi is connected and the default network.
isDefaultNetwork = true;
networkCapabilities = mDefaultNetworkCapabilities;
} else {
isDefaultNetwork = false;
networkCapabilities = mConnectivityManager.getNetworkCapabilities(
mWifiManager.getCurrentNetwork());
}

9
packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
View File

@@ -84,7 +84,7 @@ public class WifiSignalController extends
R.bool.config_showWifiIndicatorWhenEnabled);
boolean wifiVisible = mCurrentState.enabled && (
(mCurrentState.connected && mCurrentState.inetCondition == 1)
|| !mHasMobileDataFeature || mWifiTracker.isDefaultNetwork
|| !mHasMobileDataFeature || mCurrentState.isDefault
|| visibleWhenEnabled);
String wifiDesc = mCurrentState.connected ? mCurrentState.ssid : null;
boolean ssidPresent = wifiVisible && mCurrentState.ssid != null;
@@ -107,6 +107,7 @@ public class WifiSignalController extends
public void fetchInitialState() {
mWifiTracker.fetchInitialState();
mCurrentState.enabled = mWifiTracker.enabled;
mCurrentState.isDefault = mWifiTracker.isDefaultNetwork;
mCurrentState.connected = mWifiTracker.connected;
mCurrentState.ssid = mWifiTracker.ssid;
mCurrentState.rssi = mWifiTracker.rssi;
@@ -121,6 +122,7 @@ public class WifiSignalController extends
public void handleBroadcast(Intent intent) {
mWifiTracker.handleBroadcast(intent);
mCurrentState.enabled = mWifiTracker.enabled;
mCurrentState.isDefault = mWifiTracker.isDefaultNetwork;
mCurrentState.connected = mWifiTracker.connected;
mCurrentState.ssid = mWifiTracker.ssid;
mCurrentState.rssi = mWifiTracker.rssi;
@@ -131,6 +133,7 @@ public class WifiSignalController extends
private void handleStatusUpdated() {
mCurrentState.statusLabel = mWifiTracker.statusLabel;
mCurrentState.isDefault = mWifiTracker.isDefaultNetwork;
notifyListenersIfNecessary();
}
@@ -156,6 +159,7 @@ public class WifiSignalController extends
static class WifiState extends SignalController.State {
String ssid;
boolean isTransient;
boolean isDefault;
String statusLabel;
@Override
@@ -164,6 +168,7 @@ public class WifiSignalController extends
WifiState state = (WifiState) s;
ssid = state.ssid;
isTransient = state.isTransient;
isDefault = state.isDefault;
statusLabel = state.statusLabel;
}
@@ -172,6 +177,7 @@ public class WifiSignalController extends
super.toString(builder);
builder.append(",ssid=").append(ssid)
.append(",isTransient=").append(isTransient)
.append(",isDefault=").append(isDefault)
.append(",statusLabel=").append(statusLabel);
}
@@ -183,6 +189,7 @@ public class WifiSignalController extends
WifiState other = (WifiState) o;
return Objects.equals(other.ssid, ssid)
&& other.isTransient == isTransient
&& other.isDefault == isDefault
&& TextUtils.equals(other.statusLabel, statusLabel);
}
}