Merge "More debug logs for RSSI updates." into ics-factoryrom

Author: dsandler

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 void onReceive(Context context, Intent intent) {
     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,14 +317,17 @@ public void onCallStateChanged(int state, String incomingNumber) {
 
         @Override
         public void onDataConnectionStateChanged(int state, int networkType) {
-            if (DEBUG || CHATTY) {
+            if (DEBUG) {
                 Slog.d(TAG, "onDataConnectionStateChanged: state=" + state
                         + " type=" + networkType);
             }
             mDataState = state;
             mDataNetType = networkType;
             if (state < 0) {
                 // device without a data connection
+                if (CHATTY) {
+                    Slog.d(TAG, "clearing mSignalStrength");
+                }
                 mSignalStrength = null;
             }
             updateDataNetType();
@@ -390,19 +395,23 @@ private void updateAirplaneMode() {
 
     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(
                         AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0]);
             } 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 @@ else if (!mDataConnected && !mWifiConnected && !mBluetoothTethered) {
     }
 
     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 void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         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 void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
 
 
         pw.println("  - Bluetooth ----");
-        pw.print(" mBtReverseTethered=");
+        pw.print("  mBtReverseTethered=");
         pw.println(mBluetoothTethered);
 
         pw.println("  - connectivity ------");
@@ -1069,6 +1084,7 @@ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println(getResourceName(mLastCombinedSignalIconId));
         pw.print("  mLastLabel=");
         pw.print(mLastLabel);
+        pw.println("");
     }
 
     private String getResourceName(int resId) {