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

Commit 5e0ecb75 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to... 

am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '004da7e2':
  Add getCdmaSubscriptionSource to CommandsInterface.
parents 5e5f0698 004da7e2

telephony/java/com/android/internal/telephony/CommandsInterface.java

+6 −0
Original line number Diff line number Diff line
@@ -1440,6 +1440,12 @@ public interface CommandsInterface { 
     */

    void setCdmaSubscriptionSource(int cdmaSubscriptionType, Message response);



    /**

     *  Requests to get the CDMA subscription srouce

     * @param response is callback message

     */

    void getCdmaSubscriptionSource(Message response);



    /**

     *  Set the TTY mode

     *

telephony/java/com/android/internal/telephony/RIL.java

+3 −3
Original line number Diff line number Diff line
@@ -3634,12 +3634,12 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    /**

     * {@inheritDoc}

     */

    public void getCdmaSubscriptionSource(int cdmaSubscription , Message response) {

    @Override

    public void getCdmaSubscriptionSource(Message response) {

        RILRequest rr = RILRequest.obtain(

                RILConstants.RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE, response);



        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)

                + " : " + cdmaSubscription);

        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



        send(rr);

    }

telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java

+4 −0
Original line number Diff line number Diff line
@@ -326,6 +326,10 @@ class SipCommandInterface extends BaseCommands implements CommandsInterface { 
    public void reportStkServiceIsRunning(Message result) {

    }



    @Override

    public void getCdmaSubscriptionSource(Message response) {

    }



    public void getGsmBroadcastConfig(Message response) {

    }

telephony/java/com/android/internal/telephony/test/SimulatedCommands.java

+5 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,11 @@ public final class SimulatedCommands extends BaseCommands 
        resultSuccess(result, null);

    }



    @Override

    public void getCdmaSubscriptionSource(Message result) {

        unimplemented(result);

    }



    private boolean isSimLocked() {

        if (mSimLockedState != SimLockState.NONE) {

            return true;