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

Commit 491ba0a4 authored by Jack Yu's avatar Jack Yu Committed by Android Git Automerger
Browse files

am c77ef6e1: am ab800095: Fixed that device does not showing roaming icon on Sprint network 

* commit 'c77ef6e1':
  Fixed that device does not showing roaming icon on Sprint network
parents cebc7590 c77ef6e1

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

+2 −2
Original line number Diff line number Diff line
@@ -1576,8 +1576,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
@@ -1554,8 +1554,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);

    }