diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 3b097af..ed66823 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -84,6 +84,7 @@ public class NetworkController extends BroadcastReceiver { int mDataTypeIconId; boolean mDataActive; int mMobileActivityIconId; // overlay arrows for data direction + int mLastSignalLevel; String mContentDescriptionPhoneSignal; String mContentDescriptionWifi; @@ -281,8 +282,9 @@ public class NetworkController extends BroadcastReceiver { PhoneStateListener mPhoneStateListener = new PhoneStateListener() { @Override public void onSignalStrengthsChanged(SignalStrength signalStrength) { - if (DEBUG) { - Slog.d(TAG, "onSignalStrengthsChanged signalStrength=" + signalStrength); + if (DEBUG || CHATTY) { + Slog.d(TAG, "onSignalStrengthsChanged signalStrength=" + signalStrength + + ((signalStrength == null) ? "" : (" level=" + signalStrength.getLevel()))); } mSignalStrength = signalStrength; updateTelephonySignalStrength(); @@ -315,7 +317,7 @@ public class NetworkController extends BroadcastReceiver { @Override public void onDataConnectionStateChanged(int state, int networkType) { - if (DEBUG || CHATTY) { + if (DEBUG) { Slog.d(TAG, "onDataConnectionStateChanged: state=" + state + " type=" + networkType); } @@ -323,6 +325,9 @@ public class NetworkController extends BroadcastReceiver { mDataNetType = networkType; if (state < 0) { // device without a data connection + if (CHATTY) { + Slog.d(TAG, "clearing mSignalStrength"); + } mSignalStrength = null; } updateDataNetType(); @@ -390,11 +395,12 @@ public class NetworkController extends BroadcastReceiver { private final void updateTelephonySignalStrength() { if (!hasService()) { - //Slog.d(TAG, "updateTelephonySignalStrength: no service"); + if (CHATTY) Slog.d(TAG, "updateTelephonySignalStrength: !hasService()"); mPhoneSignalIconId = R.drawable.stat_sys_signal_0; mDataSignalIconId = R.drawable.stat_sys_signal_0; } else { if (mSignalStrength == null) { + if (CHATTY) Slog.d(TAG, "updateTelephonySignalStrength: mSignalStrength == null"); mPhoneSignalIconId = R.drawable.stat_sys_signal_0; mDataSignalIconId = R.drawable.stat_sys_signal_0; mContentDescriptionPhoneSignal = mContext.getString( @@ -402,7 +408,10 @@ public class NetworkController extends BroadcastReceiver { } else { int iconLevel; int[] iconList; - iconLevel = mSignalStrength.getLevel(); + mLastSignalLevel = iconLevel = mSignalStrength.getLevel(); + if (CHATTY) { + Slog.d(TAG, "updateTelephonySignalStrength: signal level = " + iconLevel); + } if (isCdma()) { if (isCdmaEri()) { iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition]; @@ -976,8 +985,10 @@ public class NetworkController extends BroadcastReceiver { } public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - pw.println("Network Controller state:"); + pw.println("NetworkController state:"); pw.println(" - telephony ------"); + pw.print(" hasService()="); + pw.println(hasService()); pw.print(" mHspaDataDistinguishable="); pw.println(mHspaDataDistinguishable); pw.print(" mDataConnected="); @@ -996,6 +1007,10 @@ public class NetworkController extends BroadcastReceiver { pw.println(TelephonyManager.getNetworkTypeName(mDataNetType)); pw.print(" mServiceState="); pw.println(mServiceState); + pw.print(" mSignalStrength="); + pw.println(mSignalStrength); + pw.print(" mLastSignalLevel="); + pw.println(mLastSignalLevel); pw.print(" mNetworkName="); pw.println(mNetworkName); pw.print(" mNetworkNameDefault="); @@ -1035,7 +1050,7 @@ public class NetworkController extends BroadcastReceiver { pw.println(" - Bluetooth ----"); - pw.print(" mBtReverseTethered="); + pw.print(" mBtReverseTethered="); pw.println(mBluetoothTethered); pw.println(" - connectivity ------"); @@ -1069,6 +1084,7 @@ public class NetworkController extends BroadcastReceiver { pw.println(getResourceName(mLastCombinedSignalIconId)); pw.print(" mLastLabel="); pw.print(mLastLabel); + pw.println(""); } private String getResourceName(int resId) { |