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

Commit ba7ae9f7 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Add new VoNR api into IRadioVoice module" am: 0d9ef9f0 am: e0652652... 

Merge "Add new VoNR api into IRadioVoice module" am: 0d9ef9f0 am: e0652652 am: 9cde6a0b am: 961eeb1c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1881110

Change-Id: Ib3379c5d3479fb2b54ba51b27c6e7633ff0008ca
parents 897c6035 961eeb1c

radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoice.aidl

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ interface IRadioVoice { 
  oneway void hangup(in int serial, in int gsmIndex);

  oneway void hangupForegroundResumeBackground(in int serial);

  oneway void hangupWaitingOrBackground(in int serial);

  oneway void isVoNrEnabled(in int serial);

  oneway void rejectCall(in int serial);

  oneway void responseAcknowledgement();

  oneway void sendBurstDtmf(in int serial, in String dtmf, in int on, in int off);
@@ -66,6 +67,7 @@ interface IRadioVoice { 
  oneway void setPreferredVoicePrivacy(in int serial, in boolean enable);

  oneway void setResponseFunctions(in android.hardware.radio.voice.IRadioVoiceResponse radioVoiceResponse, in android.hardware.radio.voice.IRadioVoiceIndication radioVoiceIndication);

  oneway void setTtyMode(in int serial, in android.hardware.radio.voice.TtyMode mode);

  oneway void setVoNrEnabled(in int serial, in boolean enable);

  oneway void startDtmf(in int serial, in String s);

  oneway void stopDtmf(in int serial);

  oneway void switchWaitingOrHoldingAndActive(in int serial);

radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoiceResponse.aidl

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ interface IRadioVoiceResponse { 
  oneway void hangupConnectionResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void hangupForegroundResumeBackgroundResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void hangupWaitingOrBackgroundResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void isVoNrEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean enable);

  oneway void rejectCallResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void sendBurstDtmfResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void sendCdmaFeatureCodeResponse(in android.hardware.radio.RadioResponseInfo info);
@@ -65,6 +66,7 @@ interface IRadioVoiceResponse { 
  oneway void setMuteResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void setPreferredVoicePrivacyResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void setTtyModeResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void setVoNrEnabledResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void startDtmfResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void stopDtmfResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void switchWaitingOrHoldingAndActiveResponse(in android.hardware.radio.RadioResponseInfo info);

radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl

+19 −0
Original line number Diff line number Diff line
@@ -266,6 +266,15 @@ oneway interface IRadioVoice { 
     */

    void hangupWaitingOrBackground(in int serial);



    /**

     * Query current Voice NR enable state

     *

     * @param serial Serial number of request.

     *

     * Response function is IRadioVoiceResponse.isVoNrEnabledResponse()

     */

    void isVoNrEnabled(in int serial);



    /**

     * Send UDUB (user determined user busy) to ringing or waiting call answer)

     *
@@ -403,6 +412,16 @@ oneway interface IRadioVoice { 
     */

    void setTtyMode(in int serial, in TtyMode mode);



    /**

     * Set Voice NR enable state

     *

     * @param serial Serial number of request.

     * @param enable true for "enable vonr" and false for "disable vonr"

     *

     * Response function is IRadioVoiceResponse.setVoNrEnabledResponse()

     */

    void setVoNrEnabled(in int serial, in boolean enable);



    /**

     * Start playing a DTMF tone. Continue playing DTMF tone until stopDtmf is received. If a

     * startDtmf() is received while a tone is currently playing, it must cancel the previous tone

radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl

+28 −0
Original line number Diff line number Diff line
@@ -466,6 +466,20 @@ oneway interface IRadioVoiceResponse { 
     */

    void hangupWaitingOrBackgroundResponse(in RadioResponseInfo info);



    /**

     * @param info Response info struct containing response type, serial no. and error

     * @param enable true for "vonr enabled" and false for "vonr disabled"

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:INTERNAL_ERR

     *   RadioError:NO_MEMORY

     *   RadioError:REQUEST_NOT_SUPPORTED

     */

    void isVoNrEnabledResponse(in RadioResponseInfo info, in boolean enable);



    /**

     * @param info Response info struct containing response type, serial no. and error

     *
@@ -687,6 +701,20 @@ oneway interface IRadioVoiceResponse { 
     */

    void setTtyModeResponse(in RadioResponseInfo info);



    /**

     * @param info Response info struct containing response type, serial no. and error

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:MODEM_ERR

     *   RadioError:INTERNAL_ERR

     *   RadioError:NO_MEMORY

     *   RadioError:REQUEST_NOT_SUPPORTED

     */

    void setVoNrEnabledResponse(in RadioResponseInfo info);



    /**

     * @param info Response info struct containing response type, serial no. and error

     *