Consider Service State OFF same as OUT OF SERVICE for combined regState
Amit Mahajan [Fri, 9 Jun 2017 18:24:55 +0000 (11:24 -0700)]
Test: manual
Bug: 37425222
Change-Id: I1afd552ff5156b96c6ec4946e8ffd42d85ad9ad7

src/java/com/android/internal/telephony/ServiceStateTracker.java

index 3d0257e..afd21c7 100644 (file)
@@ -4913,7 +4913,8 @@ public class ServiceStateTracker extends Handler {
     protected int getCombinedRegState() {
         int regState = mSS.getVoiceRegState();
         int dataRegState = mSS.getDataRegState();
-        if ((regState == ServiceState.STATE_OUT_OF_SERVICE)
+        if ((regState == ServiceState.STATE_OUT_OF_SERVICE
+                || regState == ServiceState.STATE_POWER_OFF)
                 && (dataRegState == ServiceState.STATE_IN_SERVICE)) {
             log("getCombinedRegState: return STATE_IN_SERVICE as Data is in service");
             regState = dataRegState;