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

Commit a775faf4 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "remove deprecated API sendDialerCode" into oc-dev am: 31fcda57 

am: 6fd0d2b3

Change-Id: I8239752191b094626e85935dcc6470a297742317
parents 149fd497 6fd0d2b3

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -40159,7 +40159,6 @@ package android.telephony { 
    method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);

    method public boolean isWorldPhone();

    method public void listen(android.telephony.PhoneStateListener, int);

    method public deprecated boolean sendDialerCode(java.lang.String);

    method public void sendDialerSpecialCode(java.lang.String);

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

    method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -43661,7 +43661,6 @@ package android.telephony { 
    method public boolean isWorldPhone();

    method public void listen(android.telephony.PhoneStateListener, int);

    method public boolean needsOtaServiceProvisioning();

    method public deprecated boolean sendDialerCode(java.lang.String);

    method public void sendDialerSpecialCode(java.lang.String);

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

    method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -40375,7 +40375,6 @@ package android.telephony { 
    method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);

    method public boolean isWorldPhone();

    method public void listen(android.telephony.PhoneStateListener, int);

    method public deprecated boolean sendDialerCode(java.lang.String);

    method public void sendDialerSpecialCode(java.lang.String);

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

    method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

telephony/java/android/telephony/TelephonyManager.java

+0 −24
Original line number Diff line number Diff line
@@ -3105,30 +3105,6 @@ public class TelephonyManager { 
        }

    }



    /**

     * Send the special dialer code. The IPC caller must be the current default dialer.

     * <p>

     * Requires Permission:

     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}

     *

     * @param inputCode The special dialer code to send which follows the format of *#*#<code>#*#*

     * @return true if sent sucessfully, false otherwise

     * @deprecated use {@link #sendDialerSpecialCode(String)} ()} instead.

     */

    public boolean sendDialerCode(String inputCode) {

        try {

            final ITelephony telephony = getITelephony();

            if (telephony == null) {

                Log.e(TAG, "Telephony service unavailable");

                return false;

            }

            return telephony.sendDialerCode(mContext.getOpPackageName(), inputCode);

        } catch (RemoteException | NullPointerException ex) {

            // This could happen before phone restarts due to crashing

            return false;

        }

    }



    /**

     * Send the special dialer code. The IPC caller must be the current default dialer or has

     * carrier privileges.

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

+0 −3
Original line number Diff line number Diff line
@@ -529,9 +529,6 @@ interface ITelephony { 
    void sendVisualVoicemailSmsForSubscriber(in String callingPackage, in int subId,

            in String number, in int port, in String text, in PendingIntent sentIntent);



    // Send the special dialer code. The IPC caller must be the current default dialer.

    boolean sendDialerCode(String callingPackageName, String inputCode);



    // Send the special dialer code. The IPC caller must be the current default dialer.

    void sendDialerSpecialCode(String callingPackageName, String inputCode);