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

Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom

Browse Source
This commit is contained in:
Daniel Sandler
2011-09-26 12:37:29 -07:00
committed by Android (Google) Code Review
parent 69a6d537e6 7c12eee643
commit 61b645ab86
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
View File

@@ -719,28 +719,19 @@ public class NetworkController extends BroadcastReceiver {
Slog.d(TAG, "updateConnectivity: connectionStatus=" + connectionStatus);
}
int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0);
mInetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0);
switch (info.getType()) {
case ConnectivityManager.TYPE_MOBILE:
mInetCondition = inetCondition;
updateDataNetType();
updateDataIcon();
updateTelephonySignalStrength(); // apply any change in connectionStatus
break;
case ConnectivityManager.TYPE_WIFI:
mInetCondition = inetCondition;
updateWifiIcons();
break;
case ConnectivityManager.TYPE_BLUETOOTH:
mInetCondition = inetCondition;
if (info != null) {
mBluetoothTethered = info.isConnected() ? true: false;
} else {
mBluetoothTethered = false;
}
break;
if (info != null && info.getType() == ConnectivityManager.TYPE_BLUETOOTH) {
mBluetoothTethered = info.isConnected() ? true: false;
} else {
mBluetoothTethered = false;
}
// We want to update all the icons, all at once, for any condition change
updateDataNetType();
updateDataIcon();
updateTelephonySignalStrength();
updateWifiIcons();
}
@@ -1033,8 +1024,8 @@ public class NetworkController extends BroadcastReceiver {
pw.println(mWifiLevel);
pw.print(" mWifiSsid=");
pw.println(mWifiSsid);
pw.print(" mWifiIconId=");
pw.println(mWifiIconId);
pw.print(String.format(" mWifiIconId=0x%08x/%s",
mWifiIconId, getResourceName(mWifiIconId)));
pw.print(" mWifiActivity=");
pw.println(mWifiActivity);