Fix hasService and use it in updateTelephonySignalStrength.

I introduced the bug in hasService in
change Ia463997eac7b062653b3cef00570d3fffc115ad3 which added
debug and a quick and dirty hack for 16148026.

Change-Id: I9d5fa36a8cdab2ca28487a94a9f2ecd0d0af6a4b

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 2b08902..70a82e4 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -573,9 +573,11 @@ public class NetworkControllerImpl extends BroadcastReceiver
             switch(mServiceState.getVoiceRegState()) {
                 case ServiceState.STATE_POWER_OFF:
                     retVal = false;
+                    break;
                 case ServiceState.STATE_OUT_OF_SERVICE:
                 case ServiceState.STATE_EMERGENCY_ONLY:
                     retVal = mServiceState.getDataRegState() == ServiceState.STATE_IN_SERVICE;
+                    break;
                 default:
                     retVal = true;
             }
@@ -597,8 +599,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
 
     private final void updateTelephonySignalStrength() {
         Rlog.d(TAG, "updateTelephonySignalStrength: hasService=" + hasService() + " ss=" + mSignalStrength);
-        if (false/*!hasService()*/) {
-            if (CHATTY) Log.d(TAG, "updateTelephonySignalStrength: !hasService()");
+        if (!hasService()) {
+            if (true/*CHATTY*/) Log.d(TAG, "updateTelephonySignalStrength: !hasService()");
             mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
             mQSPhoneSignalIconId = R.drawable.ic_qs_signal_no_signal;
             mDataSignalIconId = R.drawable.stat_sys_signal_null;