commit d7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25
author Sanket Padawe <sanketpadawe@google.com> Fri May 08 23:32:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 23:32:48 2015 +0000
tree 6693bc8978c4c208c23d0f0bec33fa822d94c495
parent 3c4bf826e704a42ce3d460537a0adf6263c2d503
parent afee3aa5ab7a82384d859f4fdeb65958d4c543f7

Merge "Fix Signal strength display issue in Settings." into mnc-dev

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 ea4c3e1..d6a3bf5 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -282,11 +282,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;
         }
 
@@ -314,6 +320,7 @@
             if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
                     (ServiceState.STATE_POWER_OFF == state)) {
                 mSignalStrength.setSummary("0");
+                return;
             }
 
             int signalDbm = signalStrength.getDbm();