From 0955e0154c6aecb598ec4f5eb6346a14f05fb4aa Mon Sep 17 00:00:00 2001 From: Gary Jian Date: Wed, 3 Nov 2021 15:44:36 +0800 Subject: [PATCH] Add new VoNR api into IRadioVoice module -isVoNrEnabled -setVoNrEnabled Bug: 203162440 Test: make Change-Id: Iae3e17c8ff5aa25ca0398bd179879c49deca71f5 --- .../hardware/radio/voice/IRadioVoice.aidl | 2 ++ .../radio/voice/IRadioVoiceResponse.aidl | 2 ++ .../hardware/radio/voice/IRadioVoice.aidl | 19 +++++++++++++ .../radio/voice/IRadioVoiceResponse.aidl | 28 +++++++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoice.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoice.aidl index 4cac560051..68c82fa4f8 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoice.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoice.aidl @@ -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); diff --git a/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoiceResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoiceResponse.aidl index 9f490a86eb..a3b5e58aed 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoiceResponse.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.voice/current/android/hardware/radio/voice/IRadioVoiceResponse.aidl @@ -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); diff --git a/radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl b/radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl index 1e60de509d..a012be4515 100644 --- a/radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl +++ b/radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl @@ -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 diff --git a/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl b/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl index f3cf5fba67..d126fc1905 100644 --- a/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl +++ b/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl @@ -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 *