commit ab80009565d546d6a3ef1e898207d0014e9bb26a
author Jack Yu <jackyu@google.com> Fri Sep 04 09:57:25 2015 -0700
committer Jack Yu <jackyu@google.com> Fri Sep 04 10:22:32 2015 -0700
tree 088d42f5dccca38813e2239416a1f06696ab28b5
parent 681ccc4c9c514a43ea5cf1a5e446f5994659e59f

Fixed that device does not showing roaming icon on Sprint network

The logic of how we determine roaming need to check if spn, long
name, short name are empty string first before comparison.

bug: 23733308
Change-Id: I4b1023b6dd7c8d050281efb6b29b3df4d49eaa96

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 498827c..f5806e5 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -1574,8 +1574,8 @@
         String onsl = s.getVoiceOperatorAlphaLong();
         String onss = s.getVoiceOperatorAlphaShort();
 
-        boolean equalsOnsl = onsl != null && spn.equals(onsl);
-        boolean equalsOnss = onss != null && spn.equals(onss);
+        boolean equalsOnsl = onsl != null && spn != null && !spn.isEmpty() && spn.equals(onsl);
+        boolean equalsOnss = onss != null && spn != null && !spn.isEmpty() && spn.equals(onss);
 
         return cdmaRoaming && !(equalsOnsl || equalsOnss);
     }

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 133e628..5e685fa 100755
--- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -1551,8 +1551,8 @@
         String onsl = s.getOperatorAlphaLong();
         String onss = s.getOperatorAlphaShort();
 
-        boolean equalsOnsl = onsl != null && spn.equals(onsl);
-        boolean equalsOnss = onss != null && spn.equals(onss);
+        boolean equalsOnsl = onsl != null && spn != null && !spn.isEmpty() && spn.equals(onsl);
+        boolean equalsOnss = onss != null && spn != null && !spn.isEmpty() && spn.equals(onss);
 
         return currentMccEqualsSimMcc(s) && (equalsOnsl || equalsOnss);
     }