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

Commit ad553291 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Change to update phone # in subInfo when RuimRecords have been read." into lmp-mr1-dev

parents 9a90f1dd 5866914a

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

+4 −1
Original line number Diff line number Diff line
@@ -964,8 +964,11 @@ public interface Phone { 
     *        (see getMsisdnAlphaTag)

     * @param number the new MSISDN phone number to be set on the SIM.

     * @param onComplete a callback message when the action is completed.

     *

     * @return true if req is sent, false otherwise. If req is not sent there will be no response,

     * that is, onComplete will never be sent.

     */

    void setLine1Number(String alphaTag, String number, Message onComplete);

    boolean setLine1Number(String alphaTag, String number, Message onComplete);



    /**

     * Get the voice mail access phone number. Typically dialed when the

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

+2 −2
Original line number Diff line number Diff line
@@ -809,8 +809,8 @@ public class PhoneProxy extends Handler implements Phone { 
    }



    @Override

    public void setLine1Number(String alphaTag, String number, Message onComplete) {

        mActivePhone.setLine1Number(alphaTag, number, onComplete);

    public boolean setLine1Number(String alphaTag, String number, Message onComplete) {

        return mActivePhone.setLine1Number(alphaTag, number, onComplete);

    }



    @Override

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

+12 −7
Original line number Diff line number Diff line
@@ -911,13 +911,16 @@ public class SubscriptionController extends ISub.Stub { 
            mSuccess = false;

            Message response = mHandler.obtainMessage(EVENT_WRITE_MSISDN_DONE);



            phone.setLine1Number(alphaTag, number, response);



            if (phone.setLine1Number(alphaTag, number, response)) {

                try {

                    mLock.wait();

                } catch (InterruptedException e) {

                    loge("interrupted while trying to write MSISDN");

                }

            } else {

                logd("setLine1Number() returned false; moving on");

                mSuccess = true;

            }

        }



        if (mSuccess) {
@@ -926,6 +929,8 @@ public class SubscriptionController extends ISub.Stub { 
                        + "=" + Long.toString(subId), null);

            if (DBG) logd("[setDisplayNumber]- update result :" + result);

            notifySubscriptionInfoChanged();

        } else {

            logd("[setDisplayNumber]- mSuccess is false");

        }



        return result;

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

+2 −1
Original line number Diff line number Diff line
@@ -688,8 +688,9 @@ public class CDMAPhone extends PhoneBase { 
    }



    @Override

    public void setLine1Number(String alphaTag, String number, Message onComplete) {

    public boolean setLine1Number(String alphaTag, String number, final Message onComplete) {

        Rlog.e(LOG_TAG, "setLine1Number: not possible in CDMA");

        return false;

    }



    @Override

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+4 −1
Original line number Diff line number Diff line
@@ -1076,10 +1076,13 @@ public class GSMPhone extends PhoneBase { 
    }



    @Override

    public void setLine1Number(String alphaTag, String number, Message onComplete) {

    public boolean setLine1Number(String alphaTag, String number, Message onComplete) {

        IccRecords r = mIccRecords.get();

        if (r != null) {

            r.setMsisdnNumber(alphaTag, number, onComplete);

            return true;

        } else {

            return false;

        }

    }