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

Commit 13a760af authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Add OperatorInfo constructor for unknown state. 

We were passing "" for the state if we didn't know but that causes
Exceptions.

bug:20058021
Change-Id: I04c28dfdc46eb76bf47b962b1a741b4d7e43bdef
parent 511a5bed

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

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ public class OperatorInfo implements Parcelable { 
                operatorNumeric, rilStateToState(stateString));

    }



    public OperatorInfo(String operatorAlphaLong,

            String operatorAlphaShort,

            String operatorNumeric) {

        this(operatorAlphaLong, operatorAlphaShort, operatorNumeric, State.UNKNOWN);

    }



    /**

     * See state strings defined in ril.h RIL_REQUEST_QUERY_AVAILABLE_NETWORKS

     */

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

+1 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
        String numeric = sp.getString(NETWORK_SELECTION_KEY + getSubId(), "");

        String name = sp.getString(NETWORK_SELECTION_NAME_KEY + getSubId(), "");

        String shrt = sp.getString(NETWORK_SELECTION_SHORT_KEY + getSubId(), "");

        return new OperatorInfo(numeric, name, shrt, "");

        return new OperatorInfo(numeric, name, shrt);

    }



    /**