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

Commit 4d57312d authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Ignore case in ONS when setting roaming 

When home vs roaming is decided, roaming could have been set
instead of home because isSameNamedOperators checked
if spn is equal to onsl and onss so something like this could
happen:
SPN=carrier vs ONS=carrier => home
SPN=Carrier vs ONS=carrier => roaming

Ignore case.

Bug: 26321337
Change-Id: I92a7b8b1ebdc22968a2856a6694d487607546303
parent b24d183c

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

+18 −24
Original line number Diff line number Diff line
@@ -1568,19 +1568,7 @@ public class ServiceStateTracker extends Handler { 
     * @return true for roaming state set

     */

    private boolean isRoamingBetweenOperators(boolean cdmaRoaming, ServiceState s) {

        String spn = ((TelephonyManager) mPhone.getContext().

                getSystemService(Context.TELEPHONY_SERVICE)).

                getSimOperatorNameForPhone(mPhone.getPhoneId());



        // NOTE: in case of RUIM we should completely ignore the ERI data file and

        // mOperatorAlphaLong is set from RIL_REQUEST_OPERATOR response 0 (alpha ONS)

        String onsl = s.getVoiceOperatorAlphaLong();

        String onss = s.getVoiceOperatorAlphaShort();



        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);

        return cdmaRoaming && !isSameOperatorNameFromSimAndSS(s);

    }



    void handlePollStateResultMessage(int what, AsyncResult ar) {
@@ -3471,25 +3459,31 @@ public class ServiceStateTracker extends Handler { 
        return ServiceState.RIL_REG_STATE_ROAMING == code;

    }



    /**

     * Set roaming state if operator mcc is the same as sim mcc

     * and ons is different from spn

     *

     * @param s ServiceState hold current ons

     * @return true if same operator

     */

    private boolean isSameNamedOperators(ServiceState s) {

    private boolean isSameOperatorNameFromSimAndSS(ServiceState s) {

        String spn = ((TelephonyManager) mPhone.getContext().

                getSystemService(Context.TELEPHONY_SERVICE)).

                getSimOperatorNameForPhone(getPhoneId());



        // NOTE: in case of RUIM we should completely ignore the ERI data file and

        // mOperatorAlphaLong is set from RIL_REQUEST_OPERATOR response 0 (alpha ONS)

        String onsl = s.getOperatorAlphaLong();

        String onss = s.getOperatorAlphaShort();



        boolean equalsOnsl = onsl != null && spn != null && !spn.isEmpty() && spn.equals(onsl);

        boolean equalsOnss = onss != null && spn != null && !spn.isEmpty() && spn.equals(onss);

        boolean equalsOnsl = !TextUtils.isEmpty(spn) && spn.equalsIgnoreCase(onsl);

        boolean equalsOnss = !TextUtils.isEmpty(spn) && spn.equalsIgnoreCase(onss);



        return currentMccEqualsSimMcc(s) && (equalsOnsl || equalsOnss);

        return (equalsOnsl || equalsOnss);

    }



    /**

     * Set roaming state if operator mcc is the same as sim mcc

     * and ons is not different from spn

     *

     * @param s ServiceState hold current ons

     * @return true if same operator

     */

    private boolean isSameNamedOperators(ServiceState s) {

        return currentMccEqualsSimMcc(s) && isSameOperatorNameFromSimAndSS(s);

    }



    /**