Telephony: Don't show as roaming if new state isn't in service.

  We can receive a regCode which states that we're currently roaming
  when transitioning between operator registrations. However, if the
  new service state doesn't have us registering to an operator and
  being out of service, then showing the device as "roaming" may not
  be the correct behavior. Instead, always show device as not roaming
  if the new service state is an invalid registration.

TICKET: CRACKLING-542

Change-Id: I6f49175fcebb522909e1114e74d16323f518ba9a

1 files changed, 7 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 2b6d7c4f7..117d05407 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -881,6 +881,13 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
                 roaming = true;
             }
 
+            // We can't really be roaming if we're not in service and not registered to an operator
+            // set us to false
+            if (mNewSS.getState() == ServiceState.STATE_OUT_OF_SERVICE &&
+                    mNewSS.getOperatorNumeric() == null) {
+                roaming = false;
+            }
+
             mNewSS.setVoiceRoaming(roaming);
             mNewSS.setDataRoaming(roaming);