am edc8029b: Merge "Retain signal level even when data is offline." into ics-factoryrom

* commit 'edc8029b8b9ac9233e4dc73f05415265bac712de':
  Retain signal level even when data is offline.
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 c23bfc7d..0dfc4f7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -283,7 +283,7 @@
     PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
         public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-            if (DEBUG || CHATTY) {
+            if (DEBUG) {
                 Slog.d(TAG, "onSignalStrengthsChanged signalStrength=" + signalStrength + 
                     ((signalStrength == null) ? "" : (" level=" + signalStrength.getLevel())));
             }
@@ -324,13 +324,6 @@
             }
             mDataState = state;
             mDataNetType = networkType;
-            if (state < 0) {
-                // device without a data connection
-                if (CHATTY) {
-                    Slog.d(TAG, "clearing mSignalStrength");
-                }
-                mSignalStrength = null;
-            }
             updateDataNetType();
             updateDataIcon();
             refreshViews();
@@ -410,9 +403,6 @@
                 int iconLevel;
                 int[] iconList;
                 mLastSignalLevel = iconLevel = mSignalStrength.getLevel();
-                if (CHATTY) {
-                    Slog.d(TAG, "updateTelephonySignalStrength: signal level = " + iconLevel);
-                }
                 if (isCdma()) {
                     if (isCdmaEri()) {
                         iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];