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

Commit 089f95f4 authored by Shishir Agrawal's avatar Shishir Agrawal Committed by Android (Google) Code Review
Browse files

Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev

parents 659de832 0201a6f6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28721,7 +28721,7 @@ package android.telephony { 
    method public void listen(android.telephony.PhoneStateListener, int);

    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);

    method public boolean setGlobalPreferredNetworkType();

    method public void setLine1NumberForDisplay(java.lang.String, java.lang.String);

    method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);

    method public boolean setOperatorBrandOverride(java.lang.String);

    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);

    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

telephony/java/android/telephony/TelephonyManager.java

+7 −4
Original line number Diff line number Diff line
@@ -1811,9 +1811,10 @@ public class TelephonyManager { 
     *

     * @param alphaTag alpha-tagging of the dailing nubmer

     * @param number The dialing number

     * @return true if the operation was executed correctly.

     */

    public void setLine1NumberForDisplay(String alphaTag, String number) {

        setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);

    public boolean setLine1NumberForDisplay(String alphaTag, String number) {

        return setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);

    }



    /**
@@ -1828,14 +1829,16 @@ public class TelephonyManager { 
     * @param subId the subscriber that the alphatag and dialing number belongs to.

     * @param alphaTag alpha-tagging of the dailing nubmer

     * @param number The dialing number

     * @return true if the operation was executed correctly.

     * @hide

     */

    public void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {

    public boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {

        try {

            getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number);

            return getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number);

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

        return false;

    }



    /**

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −1
Original line number Diff line number Diff line
@@ -740,8 +740,9 @@ interface ITelephony { 
     * @param subId the subscriber that the alphatag and dialing number belongs to.

     * @param alphaTag alpha-tagging of the dailing nubmer

     * @param number The dialing number

     * @return true if the operation was executed correctly.

     */

    void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number);

    boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number);



    /**

     * Returns the displayed dialing number string if it was set previously via