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

Commit d6465983 authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge "Provide an API to make USSD calls and read the responses." 

am: 41f48e3f

Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965
parents 3c6305cc 41f48e3f

api/current.txt

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

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

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

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

    method public void setDataEnabled(boolean);

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

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

api/system-current.txt

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

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

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

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

    method public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);

    method public void setDataEnabled(boolean);

    method public void setDataEnabled(int, boolean);

api/test-current.txt

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

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

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

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

    method public void setDataEnabled(boolean);

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

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

telephony/java/android/telephony/TelephonyManager.java

+31 −17
Original line number Diff line number Diff line
@@ -5006,10 +5006,24 @@ public class TelephonyManager { 


    /* <p>Requires permission:

     * @link android.Manifest.permission#CALL_PHONE}

     * @param ussdRequest the USSD command to be executed.

     * @param wrappedCallback receives a callback result.

     */

    @RequiresPermission(android.Manifest.permission.CALL_PHONE)

    public void sendUssdRequest(String ussdRequest,

                                final OnReceiveUssdResponseCallback callback, Handler handler) {

        sendUssdRequest(ussdRequest, getSubId(), callback, handler);

    }



   /* <p>Requires permission:

    * @link android.Manifest.permission#CALL_PHONE}

    * @param subId The subscription to use.

    * @param ussdRequest the USSD command to be executed.

    * @param wrappedCallback receives a callback result.

    */

    @RequiresPermission(android.Manifest.permission.CALL_PHONE)

    public void sendUssdRequest(String ussdRequest, int subId,

                                final OnReceiveUssdResponseCallback callback, Handler handler) {

        checkNotNull(callback, "OnReceiveUssdResponseCallback cannot be null.");



        ResultReceiver wrappedCallback = new ResultReceiver(handler) {
@@ -5031,7 +5045,7 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                telephony.handleUssdRequest(ussdRequest, wrappedCallback);

                telephony.handleUssdRequest(subId, ussdRequest, wrappedCallback);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#sendUSSDCode", e);

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

+2 −1
Original line number Diff line number Diff line
@@ -277,10 +277,11 @@ interface ITelephony { 
    /**

     * Handles USSD commands.

     *

     * @param subId The subscription to use.

     * @param ussdRequest the USSD command to be executed.

     * @param wrappedCallback receives a callback result.

     */

    void handleUssdRequest(String ussdRequest, in ResultReceiver wrappedCallback);

    void handleUssdRequest(int subId, String ussdRequest, in ResultReceiver wrappedCallback);



    /**

     * Handles PIN MMI commands (PIN/PIN2/PUK/PUK2), which are initiated