commit afee3aa5ab7a82384d859f4fdeb65958d4c543f7
author Sanket Padawe <sanketpadawe@google.com> Fri May 08 16:31:35 2015 -0700
committer Sanket Padawe <sanketpadawe@google.com> Fri May 08 16:31:35 2015 -0700
tree d8cca981bfe1bae9d03229e6d0c43ce71f643726
parent c531044671ee80a1615013518778ddbf2793137a

Fix Signal strength display issue in Settings.

Bug: 20821065
Change-Id: Ib98e7b80f5ee331ef0adb8df706bb697f9fff008

src/com/android/settings/deviceinfo/SimStatus.java

diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 4fa5673..5a46578 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -278,11 +278,17 @@
                 display = mRes.getString(R.string.radioInfo_service_in);
                 break;
             case ServiceState.STATE_OUT_OF_SERVICE:
+                // Set signal strength to 0 when service state is STATE_OUT_OF_SERVICE
+                mSignalStrength.setSummary("0");
             case ServiceState.STATE_EMERGENCY_ONLY:
+                // Set summary string of service state to radioInfo_service_out when
+                // service state is both STATE_OUT_OF_SERVICE & STATE_EMERGENCY_ONLY
                 display = mRes.getString(R.string.radioInfo_service_out);
                 break;
             case ServiceState.STATE_POWER_OFF:
                 display = mRes.getString(R.string.radioInfo_service_off);
+                // Also set signal strength to 0
+                mSignalStrength.setSummary("0");
                 break;
         }
 
@@ -310,6 +316,7 @@
             if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
                     (ServiceState.STATE_POWER_OFF == state)) {
                 mSignalStrength.setSummary("0");
+                return;
             }
 
             int signalDbm = signalStrength.getDbm();