Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab800095 authored by Jack Yu's avatar Jack Yu
Browse files

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
parent 681ccc4c

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

+2 −2
Original line number Diff line number Diff line
@@ -1574,8 +1574,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
        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

+2 −2
Original line number Diff line number Diff line
@@ -1551,8 +1551,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        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);

    }