Add comment for HAL radio APIs and telephony feature mapping

Bug: 297989574 Test: build pass Change-Id: I5f143de9688823f3a2c2b241f4984a22d523470f
2026-02-01 11:36:00 +00:00 · 2023-10-30 08:35:24 +00:00
parent 6b084488fb
commit b98ad6e840
20 changed files with 693 additions and 0 deletions
--- a/radio/aidl/android/hardware/radio/config/IRadioConfig.aidl
+++ b/radio/aidl/android/hardware/radio/config/IRadioConfig.aidl
@@ -40,6 +40,8 @@ oneway interface IRadioConfig {
     *
     * Response callback is
     * IRadioConfigResponse.getHalDeviceCapabilitiesResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void getHalDeviceCapabilities(in int serial);

@@ -54,6 +56,8 @@ oneway interface IRadioConfig {
     *
     * Response callback is IRadioConfigResponse.getNumOfLiveModemsResponse() which
     * will return <byte>.
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void getNumOfLiveModems(in int serial);

@@ -64,6 +68,8 @@ oneway interface IRadioConfig {
     *
     * Response callback is IRadioResponse.getPhoneCapabilityResponse() which
     * will return <PhoneCapability>.
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void getPhoneCapability(in int serial);

@@ -76,6 +82,8 @@ oneway interface IRadioConfig {
     * @param serial Serial number of request.
     *
     * Response callback is IRadioConfigResponse.getSimSlotsStatusResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getSimSlotsStatus(in int serial);

@@ -93,6 +101,8 @@ oneway interface IRadioConfig {
     * @param modemsConfig byte object including the number of live modems
     *
     * Response callback is IRadioResponse.setNumOfLiveModemsResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void setNumOfLiveModems(in int serial, in byte numOfLiveModems);

@@ -107,6 +117,8 @@ oneway interface IRadioConfig {
     * from getPhoneCapability().
     *
     * Response callback is IRadioConfigResponse.setPreferredDataModemResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setPreferredDataModem(in int serial, in byte modemId);

@@ -115,6 +127,8 @@ oneway interface IRadioConfig {
     *
     * @param radioConfigResponse Object containing radio config response functions
     * @param radioConfigIndication Object containing radio config indications
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void setResponseFunctions(in IRadioConfigResponse radioConfigResponse,
            in IRadioConfigIndication radioConfigIndication);
@@ -173,6 +187,8 @@ oneway interface IRadioConfig {
     *        getSimSlotsStatusResponse
     *
     * Response callback is IRadioConfigResponse.setSimSlotsMappingResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setSimSlotsMapping(in int serial, in SlotPortMapping[] slotMap);
 }
--- a/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl
+++ b/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl
@@ -40,6 +40,7 @@ oneway interface IRadioConfigResponse {
     *          IRadioIndication.currentPhysicalChannelConfigs_1_6()
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -53,6 +54,7 @@ oneway interface IRadioConfigResponse {
     *        are enabled and actively working as part of a working connectivity stack
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     */
@@ -65,6 +67,7 @@ oneway interface IRadioConfigResponse {
     *        how many logical modems it has, how many data connections it supports.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -78,6 +81,8 @@ oneway interface IRadioConfigResponse {
     *        equal to the number of physical slots on the device
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -91,6 +96,7 @@ oneway interface IRadioConfigResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -101,6 +107,7 @@ oneway interface IRadioConfigResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -112,6 +119,8 @@ oneway interface IRadioConfigResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
--- a/radio/aidl/android/hardware/radio/data/IRadioData.aidl
+++ b/radio/aidl/android/hardware/radio/data/IRadioData.aidl
@@ -48,6 +48,8 @@ oneway interface IRadioData {
     * @param serial Serial number of request.
     *
     * Response function is IRadioDataResponse.allocatePduSessionIdResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void allocatePduSessionId(in int serial);

@@ -60,6 +62,8 @@ oneway interface IRadioData {
     * @param id callId The identifier of the data call which is provided in SetupDataCallResult
     *
     * Response function is IRadioDataResponse.cancelHandoverResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void cancelHandover(in int serial, in int callId);

@@ -73,6 +77,8 @@ oneway interface IRadioData {
     * @param reason The request reason. Must be normal, handover, or shutdown.
     *
     * Response function is IRadioDataResponse.deactivateDataCallResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void deactivateDataCall(in int serial, in int cid, in DataRequestReason reason);

@@ -83,6 +89,8 @@ oneway interface IRadioData {
     * @param serial Serial number of request.
     *
     * Response function is IRadioDataResponse.getDataCallListResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void getDataCallList(in int serial);

@@ -96,6 +104,8 @@ oneway interface IRadioData {
     * @param serial Serial number of request.
     *
     * Response function is IRadioDataResponse.getSlicingConfigResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void getSlicingConfig(in int serial);

@@ -107,6 +117,8 @@ oneway interface IRadioData {
     * @param id Pdu session id to release.
     *
     * Response function is IRadioDataResponse.releasePduSessionIdResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void releasePduSessionId(in int serial, in int id);

@@ -114,6 +126,8 @@ oneway interface IRadioData {
     * When response type received from a radio indication or radio response is
     * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
     * acknowledge the receipt of those messages by sending responseAcknowledgement().
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void responseAcknowledgement();

@@ -124,6 +138,8 @@ oneway interface IRadioData {
     * @param allow true to allow data calls, false to disallow data calls
     *
     * Response function is IRadioDataResponse.setDataAllowedResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setDataAllowed(in int serial, in boolean allow);

@@ -134,6 +150,8 @@ oneway interface IRadioData {
     * @param profiles Array of DataProfileInfo to set.
     *
     * Response function is IRadioDataResponse.setDataProfileResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setDataProfile(in int serial, in DataProfileInfo[] profiles);

@@ -155,6 +173,8 @@ oneway interface IRadioData {
     *        DataThrottlingAction:HOLD.
     *
     * Response function is IRadioDataResponse.setDataThrottlingResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setDataThrottling(in int serial, in DataThrottlingAction dataThrottlingAction,
            in long completionDurationMillis);
@@ -167,6 +187,8 @@ oneway interface IRadioData {
     *        initial attach APN.
     *
     * Response function is IRadioDataResponse.setInitialAttachApnResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setInitialAttachApn(in int serial, in @nullable DataProfileInfo dataProfileInfo);

@@ -175,6 +197,8 @@ oneway interface IRadioData {
     *
     * @param radioDataResponse Object containing response functions
     * @param radioDataIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setResponseFunctions(
            in IRadioDataResponse radioDataResponse, in IRadioDataIndication radioDataIndication);
@@ -229,6 +253,8 @@ oneway interface IRadioData {
     *        example, a zero-rating slice.
     *
     * Response function is IRadioDataResponse.setupDataCallResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void setupDataCall(in int serial, in AccessNetwork accessNetwork,
            in DataProfileInfo dataProfileInfo, in boolean roamingAllowed,
@@ -250,6 +276,8 @@ oneway interface IRadioData {
     * @param id callId The identifier of the data call which is provided in SetupDataCallResult
     *
     * Response function is IRadioDataResponse.startHandoverResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void startHandover(in int serial, in int callId);

@@ -260,6 +288,8 @@ oneway interface IRadioData {
     * @param keepalive A request structure containing all necessary info to describe a keepalive
     *
     * Response function is IRadioDataResponse.startKeepaliveResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void startKeepalive(in int serial, in KeepaliveRequest keepalive);

@@ -271,6 +301,8 @@ oneway interface IRadioData {
     *        IRadioDataResponse.startKeepaliveResponse
     *
     * Response function is IRadioDataResponse.stopKeepaliveResponse()
+     *
+     * This is available when android.hardware.telephony.data is defined.
     */
    void stopKeepalive(in int serial, in int sessionHandle);
 }
--- a/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl
+++ b/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl
@@ -41,6 +41,7 @@ oneway interface IRadioDataResponse {
     * @param id The allocated id. On an error, this is set to 0.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -53,6 +54,7 @@ oneway interface IRadioDataResponse {
     * @param dcResponse Attributes of data call
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -65,6 +67,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE indicates success. Any other error will remove the network from the list.
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_CALL_ID
@@ -83,6 +86,7 @@ oneway interface IRadioDataResponse {
     * @param dcResponse List of SetupDataCallResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -95,6 +99,7 @@ oneway interface IRadioDataResponse {
     * @param slicingConfig Current slicing configuration
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -106,6 +111,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -117,6 +123,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -135,6 +142,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SUBSCRIPTION_NOT_AVAILABLE
@@ -150,6 +158,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     *  Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *  RadioError:NONE
     *  RadioError:RADIO_NOT_AVAILABLE
     *  RadioError:MODEM_ERR
@@ -161,6 +170,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SUBSCRIPTION_NOT_AVAILABLE
@@ -180,6 +190,7 @@ oneway interface IRadioDataResponse {
     * @param dcResponse SetupDataCallResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE must be returned on both success and failure of setup with the
     *              DataCallResponse.status containing the actual status
     *              For all other errors the DataCallResponse is ignored.
@@ -197,6 +208,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -212,6 +224,7 @@ oneway interface IRadioDataResponse {
     *        request.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:NO_RESOURCES
     *   RadioError:INVALID_ARGUMENTS
@@ -222,6 +235,7 @@ oneway interface IRadioDataResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.data is not defined
     *   RadioError:NONE
     *   RadioError:INVALID_ARGUMENTS
     */
--- a/radio/aidl/android/hardware/radio/ims/IRadioIms.aidl
+++ b/radio/aidl/android/hardware/radio/ims/IRadioIms.aidl
@@ -45,6 +45,8 @@ oneway interface IRadioIms {
     * @param srvccCalls the list of calls
     *
     * Response function is IRadioImsResponse.setSrvccCallInfoResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void setSrvccCallInfo(int serial, in SrvccCall[] srvccCalls);

@@ -60,6 +62,8 @@ oneway interface IRadioIms {
     * @param imsRegistration IMS registration information
     *
     * Response function is IRadioImsResponse.updateImsRegistrationInfoResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void updateImsRegistrationInfo(int serial, in ImsRegistration imsRegistration);

@@ -90,6 +94,8 @@ oneway interface IRadioIms {
     *        mobile terminated use case eg. MO/MT call/SMS etc
     *
     * Response function is IRadioImsResponse.startImsTrafficResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void startImsTraffic(int serial, int token, ImsTrafficType imsTrafficType,
            AccessNetwork accessNetworkType, ImsCall.Direction trafficDirection);
@@ -103,6 +109,8 @@ oneway interface IRadioIms {
     * @param token The token assigned by startImsTraffic()
     *
     * Response function is IRadioImsResponse.stopImsTrafficResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void stopImsTraffic(int serial, int token);

@@ -114,6 +122,8 @@ oneway interface IRadioIms {
     * @param reason Specifies the reason that causes EPS fallback
     *
     * Response function is IRadioImsResponse.triggerEpsFallbackResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void triggerEpsFallback(int serial, in EpsFallbackReason reason);

@@ -122,6 +132,8 @@ oneway interface IRadioIms {
     *
     * @param radioImsResponse Object containing response functions
     * @param radioImsIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void setResponseFunctions(
            in IRadioImsResponse radioImsResponse, in IRadioImsIndication radioImsIndication);
@@ -137,6 +149,8 @@ oneway interface IRadioIms {
     * @param bitsPerSecond The bit rate requested by the opponent UE
     *
     * Response function is IRadioImsResponse.sendAnbrQueryResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void sendAnbrQuery(
            int serial, ImsStreamType mediaType, ImsStreamDirection direction, int bitsPerSecond);
@@ -148,6 +162,8 @@ oneway interface IRadioIms {
     * @param imsCalls The list of IMS calls
     *
     * Response function is IRadioImsResponse.updateImsCallStatusResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void updateImsCallStatus(int serial, in ImsCall[] imsCalls);
 }
--- a/radio/aidl/android/hardware/radio/ims/IRadioImsResponse.aidl
+++ b/radio/aidl/android/hardware/radio/ims/IRadioImsResponse.aidl
@@ -29,6 +29,7 @@ oneway interface IRadioImsResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -45,6 +46,7 @@ oneway interface IRadioImsResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -63,6 +65,7 @@ oneway interface IRadioImsResponse {
     *        it should be {@code null}.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -80,6 +83,7 @@ oneway interface IRadioImsResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -96,6 +100,7 @@ oneway interface IRadioImsResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -112,6 +117,7 @@ oneway interface IRadioImsResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -128,6 +134,7 @@ oneway interface IRadioImsResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
--- a/radio/aidl/android/hardware/radio/ims/media/IImsMedia.aidl
+++ b/radio/aidl/android/hardware/radio/ims/media/IImsMedia.aidl
@@ -31,6 +31,8 @@ oneway interface IImsMedia {
     * Set the listener functions for receiving notifications from the RTP stack.
     *
     * @param mediaListener Object containing listener methods
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void setListener(in IImsMediaListener mediaListener);

@@ -46,6 +48,8 @@ oneway interface IImsMedia {
     * @param localEndPoint provides IP address, port and logical modem id for local RTP endpoint
     * @param config provides remote end point info and codec details. This could be null initially
     *        and the application may update this later using modifySession() API.
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void openSession(int sessionId, in LocalEndPoint localEndPoint, in RtpConfig config);

@@ -54,6 +58,8 @@ oneway interface IImsMedia {
     * This shall also close the session specific binder connection opened as part of openSession().
     *
     * @param sessionId identifier for the rtp session that needs to be closed
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void closeSession(int sessionId);
 }
--- a/radio/aidl/android/hardware/radio/ims/media/IImsMediaSession.aidl
+++ b/radio/aidl/android/hardware/radio/ims/media/IImsMediaSession.aidl
@@ -32,6 +32,8 @@ oneway interface IImsMediaSession {
     * Set the listener functions to receive IMS media session specific notifications.
     *
     * @param sessionListener Object containing notification methods
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void setListener(in IImsMediaSessionListener sessionListener);

@@ -40,6 +42,8 @@ oneway interface IImsMediaSession {
     * the media stream by changing the value of the MediaDirection.
     *
     * @param config provides remote end point info and codec details
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void modifySession(in RtpConfig config);

@@ -48,6 +52,8 @@ oneway interface IImsMediaSession {
     *
     * @param dtmfDigit single char having one of 12 values: 0-9, *, #
     * @param duration of the key press in milliseconds.
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void sendDtmf(char dtmfDigit, int duration);

@@ -57,12 +63,16 @@ oneway interface IImsMediaSession {
     * stopDtmf() is not received yet, then that digit must be stopped first
     *
     * @param dtmfDigit single char having one of 12 values: 0-9, *, #
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void startDtmf(char dtmfDigit);

    /**
     * Stop sending the last DTMF digit started by startDtmf().
     * stopDtmf() without preceding startDtmf() must be ignored.
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void stopDtmf();

@@ -70,6 +80,8 @@ oneway interface IImsMediaSession {
     * Send RTP header extension to the other party in the next RTP packet.
     *
     * @param extensions data to be transmitted via RTP header extension
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void sendHeaderExtension(in List<RtpHeaderExtension> extensions);

@@ -78,6 +90,8 @@ oneway interface IImsMediaSession {
     * media quality notifications.
     *
     * @param threshold media quality thresholds for various quality parameters
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void setMediaQualityThreshold(in MediaQualityThreshold threshold);
 }
--- a/radio/aidl/android/hardware/radio/messaging/IRadioMessaging.aidl
+++ b/radio/aidl/android/hardware/radio/messaging/IRadioMessaging.aidl
@@ -50,6 +50,8 @@ oneway interface IRadioMessaging {
     * @param ackPdu acknowledgement TPDU in hexadecimal format
     *
     * Response function is IRadioMessagingResponse.acknowledgeIncomingGsmSmsWithPduResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void acknowledgeIncomingGsmSmsWithPdu(in int serial, in boolean success, in String ackPdu);

@@ -61,6 +63,8 @@ oneway interface IRadioMessaging {
     * @param smsAck Cdma Sms ack to be sent described by CdmaSmsAck
     *
     * Response function is IRadioMessagingResponse.acknowledgeLastIncomingCdmaSmsResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void acknowledgeLastIncomingCdmaSms(in int serial, in CdmaSmsAck smsAck);

@@ -75,6 +79,8 @@ oneway interface IRadioMessaging {
     *        in TS 23.040, 9.2.3.22.
     *
     * Response function is IRadioMessagingResponse.acknowledgeLastIncomingGsmSmsResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void acknowledgeLastIncomingGsmSms(
            in int serial, in boolean success, in SmsAcknowledgeFailCause cause);
@@ -86,6 +92,8 @@ oneway interface IRadioMessaging {
     * @param index record index of the message to delete
     *
     * Response function is IRadioMessagingResponse.deleteSmsOnRuimResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void deleteSmsOnRuim(in int serial, in int index);

@@ -96,6 +104,8 @@ oneway interface IRadioMessaging {
     * @param index Record index of the message to delete.
     *
     * Response function is IRadioMessagingResponse.deleteSmsOnSimResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void deleteSmsOnSim(in int serial, in int index);

@@ -105,6 +115,8 @@ oneway interface IRadioMessaging {
     * @param serial Serial number of request.
     *
     * Response function is IRadioMessagingResponse.getCdmaBroadcastConfigResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void getCdmaBroadcastConfig(in int serial);

@@ -114,6 +126,8 @@ oneway interface IRadioMessaging {
     * @param serial Serial number of request.
     *
     * Response function is IRadioMessagingResponse.getGsmBroadcastConfigResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void getGsmBroadcastConfig(in int serial);

@@ -123,6 +137,8 @@ oneway interface IRadioMessaging {
     * @param serial Serial number of request.
     *
     * Response function is IRadioMessagingResponse.getSmscAddressResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void getSmscAddress(in int serial);

@@ -134,6 +150,8 @@ oneway interface IRadioMessaging {
     *        false if memory capacity is exceeded
     *
     * Response function is IRadioMessagingResponse.reportSmsMemoryStatusResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void reportSmsMemoryStatus(in int serial, in boolean available);

@@ -141,6 +159,8 @@ oneway interface IRadioMessaging {
     * When response type received from a radio indication or radio response is
     * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
     * acknowledge the receipt of those messages by sending responseAcknowledgement().
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void responseAcknowledgement();

@@ -151,6 +171,8 @@ oneway interface IRadioMessaging {
     * @param sms CdmaSmsMessage to be sent
     *
     * Response function is IRadioMessagingResponse.sendCdmaSmsResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void sendCdmaSms(in int serial, in CdmaSmsMessage sms);

@@ -162,6 +184,8 @@ oneway interface IRadioMessaging {
     * @param sms CdmaSmsMessage to be sent
     *
     * Response function is IRadioMessagingResponse.sendCdmaSmsExpectMoreResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void sendCdmaSmsExpectMore(in int serial, in CdmaSmsMessage sms);

@@ -174,6 +198,8 @@ oneway interface IRadioMessaging {
     * @param message ImsSmsMessage to be sent
     *
     * Response function is IRadioMessagingResponse.sendImsSmsResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void sendImsSms(in int serial, in ImsSmsMessage message);

@@ -186,6 +212,8 @@ oneway interface IRadioMessaging {
     * @param message GsmSmsMessage to be sent
     *
     * Response function is IRadioMessagingResponse.sendSmsResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void sendSms(in int serial, in GsmSmsMessage message);

@@ -200,6 +228,8 @@ oneway interface IRadioMessaging {
     * @param message GsmSmsMessage to be sent
     *
     * Response function is IRadioMessagingResponse.sendSmsExpectMoreResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void sendSmsExpectMore(in int serial, in GsmSmsMessage message);

@@ -211,6 +241,8 @@ oneway interface IRadioMessaging {
     *        true = activate, false = turn off
     *
     * Response function is IRadioMessagingResponse.setCdmaBroadcastActivationResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void setCdmaBroadcastActivation(in int serial, in boolean activate);

@@ -221,6 +253,8 @@ oneway interface IRadioMessaging {
     * @param configInfo CDMA Broadcast SMS config to be set.
     *
     * Response function is IRadioMessagingResponse.setCdmaBroadcastConfigResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void setCdmaBroadcastConfig(in int serial, in CdmaBroadcastSmsConfigInfo[] configInfo);

@@ -232,6 +266,8 @@ oneway interface IRadioMessaging {
     *        Cell Broadcast SMS. true = activate, false = turn off
     *
     * Response function is IRadioMessagingResponse.setGsmBroadcastActivationResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void setGsmBroadcastActivation(in int serial, in boolean activate);

@@ -242,6 +278,8 @@ oneway interface IRadioMessaging {
     * @param configInfo Setting of GSM/WCDMA Cell broadcast config
     *
     * Response function is IRadioMessagingResponse.setGsmBroadcastConfigResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void setGsmBroadcastConfig(in int serial, in GsmBroadcastSmsConfigInfo[] configInfo);

@@ -250,6 +288,8 @@ oneway interface IRadioMessaging {
     *
     * @param radioMessagingResponse Object containing response functions
     * @param radioMessagingIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void setResponseFunctions(in IRadioMessagingResponse radioMessagingResponse,
            in IRadioMessagingIndication radioMessagingIndication);
@@ -261,6 +301,8 @@ oneway interface IRadioMessaging {
     * @param smsc Short Message Service Center address to set
     *
     * Response function is IRadioMessagingResponse.setSmscAddressResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void setSmscAddress(in int serial, in String smsc);

@@ -271,6 +313,8 @@ oneway interface IRadioMessaging {
     * @param cdmaSms CdmaSmsWriteArgs
     *
     * Response function is IRadioMessagingResponse.writeSmsToRuimResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void writeSmsToRuim(in int serial, in CdmaSmsWriteArgs cdmaSms);

@@ -281,6 +325,8 @@ oneway interface IRadioMessaging {
     * @param smsWriteArgs SmsWriteArgs
     *
     * Response function is IRadioMessagingResponse.writeSmsToSimResponse()
+     *
+     * This is available when android.hardware.telephony.messaging is defined.
     */
    void writeSmsToSim(in int serial, in SmsWriteArgs smsWriteArgs);
 }
--- a/radio/aidl/android/hardware/radio/messaging/IRadioMessagingResponse.aidl
+++ b/radio/aidl/android/hardware/radio/messaging/IRadioMessagingResponse.aidl
@@ -31,6 +31,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -44,6 +46,7 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -66,6 +69,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -88,6 +93,7 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -109,6 +115,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_FULL
@@ -131,6 +139,7 @@ oneway interface IRadioMessagingResponse {
     * @param configs Vector of CDMA Broadcast SMS configs.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -153,6 +162,8 @@ oneway interface IRadioMessagingResponse {
     * @param configs Vector of GSM/WCDMA Cell broadcast configs
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -175,6 +186,8 @@ oneway interface IRadioMessagingResponse {
     * @param smsc Short Message Service Center address on the device
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -196,6 +209,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -216,6 +231,7 @@ oneway interface IRadioMessagingResponse {
     * @param sms Response to sms sent as defined by SendSmsResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SMS_SEND_FAIL_RETRY
@@ -249,6 +265,7 @@ oneway interface IRadioMessagingResponse {
     * @param sms Sms result struct as defined by SendSmsResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -282,6 +299,7 @@ oneway interface IRadioMessagingResponse {
     * @param sms Response to sms sent as defined by SendSmsResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SMS_SEND_FAIL_RETRY
@@ -309,6 +327,8 @@ oneway interface IRadioMessagingResponse {
     * @param sms Response to sms sent as defined by SendSmsResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SMS_SEND_FAIL_RETRY
@@ -341,6 +361,8 @@ oneway interface IRadioMessagingResponse {
     * @param sms Response to sms sent as defined by SendSmsResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SMS_SEND_FAIL_RETRY
@@ -371,6 +393,7 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -391,6 +414,7 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -410,6 +434,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -430,6 +456,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -449,6 +477,8 @@ oneway interface IRadioMessagingResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -471,6 +501,7 @@ oneway interface IRadioMessagingResponse {
     * @param index record index where the cmda sms message is stored
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -497,6 +528,8 @@ oneway interface IRadioMessagingResponse {
     * @param index record index where the message is stored
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.messaging is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_FULL
--- a/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl
+++ b/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl
@@ -48,6 +48,8 @@ oneway interface IRadioModem {
     * @param on True to turn on the logical modem, otherwise turn it off.
     *
     * Response function is IRadioModemResponse.enableModemResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void enableModem(in int serial, in boolean on);

@@ -57,6 +59,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.getBasebandVersionResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void getBasebandVersion(in int serial);

@@ -68,6 +72,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.getDeviceIdentityResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     * @deprecated use getImei(int serial)
     */
    void getDeviceIdentity(in int serial);
@@ -78,6 +84,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.getHardwareConfigResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void getHardwareConfig(in int serial);

@@ -89,6 +97,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.getModemActivityInfoResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getModemActivityInfo(in int serial);

@@ -99,6 +109,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.getModemStackStatusResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void getModemStackStatus(in int serial);

@@ -108,6 +120,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.getRadioCapabilityResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getRadioCapability(in int serial);

@@ -146,6 +160,8 @@ oneway interface IRadioModem {
     *
     * Response function is IRadioModemResponse.nvWriteCdmaPrlResponse()
     *
+     * This is available when android.hardware.telephony.cdma is defined.
+     *
     * @deprecated NV APIs are deprecated starting from Android U.
     */
    void nvWriteCdmaPrl(in int serial, in byte[] prl);
@@ -170,6 +186,8 @@ oneway interface IRadioModem {
     * @param serial Serial number of request.
     *
     * Response function is IRadioModemResponse.requestShutdownResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void requestShutdown(in int serial);

@@ -177,6 +195,8 @@ oneway interface IRadioModem {
     * When response type received from a radio indication or radio response is
     * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
     * acknowledge the receipt of those messages by sending responseAcknowledgement().
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void responseAcknowledgement();

@@ -189,6 +209,8 @@ oneway interface IRadioModem {
     * @param state The updated state. See the definition of state at DeviceStateType.
     *
     * Response function is IRadioModemResponse.sendDeviceStateResponse()
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void sendDeviceState(in int serial, in DeviceStateType deviceStateType, in boolean state);

@@ -201,6 +223,8 @@ oneway interface IRadioModem {
     * @param rc RadioCapability structure to be set
     *
     * Response function is IRadioModemResponse.setRadioCapabilityResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setRadioCapability(in int serial, in RadioCapability rc);

@@ -225,6 +249,8 @@ oneway interface IRadioModem {
     *        on this modem or not. No effect if forEmergencyCall is false, or powerOn is false.
     *
     * Response function is IRadioConfigResponse.setRadioPowerResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setRadioPower(in int serial, in boolean powerOn, in boolean forEmergencyCall,
            in boolean preferredForEmergencyCall);
@@ -234,6 +260,8 @@ oneway interface IRadioModem {
     *
     * @param radioModemResponse Object containing response functions
     * @param radioModemIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    void setResponseFunctions(in IRadioModemResponse radioModemResponse,
            in IRadioModemIndication radioModemIndication);
@@ -244,6 +272,8 @@ oneway interface IRadioModem {
     * @param serial : Serial number of request.
     *
     * Response function is IRadioModemResponse.getImeiResponse()
+     *
+     * This is available when android.hardware.telephony.gsm is defined.
     */
    void getImei(in int serial);
 }
--- a/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl
+++ b/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl
@@ -41,6 +41,7 @@ oneway interface IRadioModemResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MODEM_ERR
@@ -55,6 +56,7 @@ oneway interface IRadioModemResponse {
     * @param version string containing version string for log reporting
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:EMPTY_RECORD
@@ -79,6 +81,7 @@ oneway interface IRadioModemResponse {
     * accessing the device.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -100,6 +103,7 @@ oneway interface IRadioModemResponse {
     * @param config Array of HardwareConfig of the radio.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     */
@@ -110,6 +114,8 @@ oneway interface IRadioModemResponse {
     * @param activityInfo modem activity information
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -126,6 +132,7 @@ oneway interface IRadioModemResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MODEM_ERR
@@ -137,6 +144,8 @@ oneway interface IRadioModemResponse {
     * @param rc Radio capability as defined by RadioCapability in types.hal
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -175,6 +184,7 @@ oneway interface IRadioModemResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *
@@ -197,6 +207,8 @@ oneway interface IRadioModemResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -212,6 +224,7 @@ oneway interface IRadioModemResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -229,6 +242,8 @@ oneway interface IRadioModemResponse {
     *        feedback return status
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE means a unsol radioCapability() will be sent within 30 seconds.
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -247,6 +262,8 @@ oneway interface IRadioModemResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:INTERNAL_ERR
     *   RadioError:INVALID_ARGUMENTS
@@ -265,6 +282,7 @@ oneway interface IRadioModemResponse {
     * @param imeiInfo IMEI information
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.gsm is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MODEM_ERR
--- a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl
+++ b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl
@@ -48,6 +48,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getAllowedNetworkTypesBitmapResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getAllowedNetworkTypesBitmap(in int serial);

@@ -57,6 +59,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getAvailableBandModesResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getAvailableBandModes(in int serial);

@@ -66,6 +70,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getAvailableNetworksResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getAvailableNetworks(in int serial);

@@ -75,6 +81,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getBarringInfoResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getBarringInfo(in int serial);

@@ -84,6 +92,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getCdmaRoamingPreferenceResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void getCdmaRoamingPreference(in int serial);

@@ -96,6 +106,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getCellInfoListResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getCellInfoList(in int serial);

@@ -105,6 +117,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getDataRegistrationStateResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getDataRegistrationState(in int serial);

@@ -115,6 +129,8 @@ oneway interface IRadioNetwork {
     *
     * Response function is IRadioNetworkResponse.getImsRegistrationStateResponse()
     *
+     * This is available when android.hardware.telephony.ims is defined.
+     *
     * @deprecated Deprecated starting from Android U.
     */
    void getImsRegistrationState(in int serial);
@@ -125,6 +141,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getNetworkSelectionModeResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getNetworkSelectionMode(in int serial);

@@ -134,6 +152,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getOperatorResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getOperator(in int serial);

@@ -143,6 +163,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getSignalStrengthResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getSignalStrength(in int serial);

@@ -152,6 +174,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getSystemSelectionChannelsResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getSystemSelectionChannels(in int serial);

@@ -162,6 +186,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getVoiceRadioTechnologyResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getVoiceRadioTechnology(in int serial);

@@ -171,6 +197,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.getVoiceRegistrationStateResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void getVoiceRegistrationState(in int serial);

@@ -180,6 +208,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.isNrDualConnectivityEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void isNrDualConnectivityEnabled(in int serial);

@@ -187,6 +217,8 @@ oneway interface IRadioNetwork {
     * When response type received from a radio indication or radio response is
     * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
     * acknowledge the receipt of those messages by sending responseAcknowledgement().
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void responseAcknowledgement();

@@ -199,6 +231,8 @@ oneway interface IRadioNetwork {
     * @param networkTypeBitmap a 32-bit bearer bitmap of RadioAccessFamily
     *
     * Response function is IRadioNetworkResponse.setAllowedNetworkTypesBitmapResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setAllowedNetworkTypesBitmap(in int serial, in int networkTypeBitmap);

@@ -209,6 +243,8 @@ oneway interface IRadioNetwork {
     * @param mode RadioBandMode
     *
     * Response function is IRadioNetworkResponse.setBandModeResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setBandMode(in int serial, in RadioBandMode mode);

@@ -221,6 +257,8 @@ oneway interface IRadioNetwork {
     * @param newPassword new password
     *
     * Response function is IRadioNetworkResponse.setBarringPasswordResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setBarringPassword(
            in int serial, in String facility, in String oldPassword, in String newPassword);
@@ -232,6 +270,8 @@ oneway interface IRadioNetwork {
     * @param type CdmaRoamingType defined in types.hal
     *
     * Response function is IRadioNetworkResponse.setCdmaRoamingPreferenceResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void setCdmaRoamingPreference(in int serial, in CdmaRoamingType type);

@@ -244,6 +284,8 @@ oneway interface IRadioNetwork {
     * @param rate minimum time in milliseconds to indicate time between unsolicited cellInfoList()
     *
     * Response function is IRadioNetworkResponse.setCellInfoListRateResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setCellInfoListRate(in int serial, in int rate);

@@ -257,6 +299,8 @@ oneway interface IRadioNetwork {
     *        indications are enabled. See IndicationFilter for the definition of each bit.
     *
     * Response function is IRadioNetworkResponse.setIndicationFilterResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setIndicationFilter(in int serial, in int indicationFilter);

@@ -281,6 +325,8 @@ oneway interface IRadioNetwork {
     * @param accessNetwork The type of network for which to apply these thresholds.
     *
     * Response function is IRadioNetworkResponse.setLinkCapacityReportingCriteriaResponse().
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setLinkCapacityReportingCriteria(in int serial, in int hysteresisMs,
            in int hysteresisDlKbps, in int hysteresisUlKbps, in int[] thresholdsDownlinkKbps,
@@ -296,6 +342,8 @@ oneway interface IRadioNetwork {
     * @param enable true=updates enabled (+CREG=2), false=updates disabled (+CREG=1)
     *
     * Response function is IRadioNetworkResponse.setLocationUpdatesResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setLocationUpdates(in int serial, in boolean enable);

@@ -306,6 +354,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.setNetworkSelectionModeAutomaticResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setNetworkSelectionModeAutomatic(in int serial);

@@ -322,6 +372,8 @@ oneway interface IRadioNetwork {
     *        the next best RAN for network registration.
     *
     * Response function is IRadioNetworkResponse.setNetworkSelectionModeManualResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setNetworkSelectionModeManual(
            in int serial, in String operatorNumeric, in AccessNetwork ran);
@@ -338,6 +390,8 @@ oneway interface IRadioNetwork {
     *           {NrDualConnectivityState:DISABLE_IMMEDIATE}
     *
     * Response function is IRadioNetworkResponse.setNrDualConnectivityStateResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setNrDualConnectivityState(
            in int serial, in NrDualConnectivityState nrDualConnectivityState);
@@ -347,6 +401,8 @@ oneway interface IRadioNetwork {
     *
     * @param radioNetworkResponse Object containing response functions
     * @param radioNetworkIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setResponseFunctions(in IRadioNetworkResponse radioNetworkResponse,
            in IRadioNetworkIndication radioNetworkIndication);
@@ -365,6 +421,8 @@ oneway interface IRadioNetwork {
     *        criteria. See SignalThresholdInfo for details.
     *
     * Response function is IRadioNetworkResponse.setSignalStrengthReportingCriteriaResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setSignalStrengthReportingCriteria(
            in int serial, in SignalThresholdInfo[] signalThresholdInfos);
@@ -377,6 +435,8 @@ oneway interface IRadioNetwork {
     * @param enable true = notifications enabled, false = notifications disabled.
     *
     * Response function is IRadioNetworkResponse.setSuppServiceNotificationsResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setSuppServiceNotifications(in int serial, in boolean enable);

@@ -390,6 +450,8 @@ oneway interface IRadioNetwork {
     * @param specifiers which bands to scan. Only used if specifyChannels is true.
     *
     * Response function is IRadioNetworkResponse.setSystemSelectionChannelsResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setSystemSelectionChannels(
            in int serial, in boolean specifyChannels, in RadioAccessSpecifier[] specifiers);
@@ -401,6 +463,8 @@ oneway interface IRadioNetwork {
     * @param request Defines the radio networks/bands/channels which need to be scanned.
     *
     * Response function is IRadioNetworkResponse.startNetworkScanResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void startNetworkScan(in int serial, in NetworkScanRequest request);

@@ -410,6 +474,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.stopNetworkScanResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void stopNetworkScan(in int serial);

@@ -420,6 +486,8 @@ oneway interface IRadioNetwork {
     * @param netPin Network depersonlization code
     *
     * Response function is IRadioNetworkResponse.supplyNetworkDepersonalizationResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void supplyNetworkDepersonalization(in int serial, in String netPin);

@@ -432,6 +500,8 @@ oneway interface IRadioNetwork {
     *
     * @param serial Serial number of request.
     * @param usageSetting the usage setting for the current SIM.
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    oneway void setUsageSetting(in int serial, in UsageSetting usageSetting);

@@ -441,6 +511,8 @@ oneway interface IRadioNetwork {
     * <p>Gets the usage setting in accordance with 3gpp 24.301 sec 4.3 and 3gpp 24.501 sec 4.3.
     *
     * @param serial Serial number of request.
+     *
+     * This is available when android.hardware.telephony is defined.
     */
    oneway void getUsageSetting(in int serial);

@@ -452,6 +524,8 @@ oneway interface IRadioNetwork {
     * type of service to be scanned.
     *
     * Response function is IRadioEmergencyResponse.setEmergencyModeResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setEmergencyMode(int serial, in EmergencyMode emcModeType);

@@ -463,6 +537,8 @@ oneway interface IRadioNetwork {
     *                See {@link EmergencyNetworkScanTrigger}.
     *
     * Response function is IRadioEmergencyResponse.triggerEmergencyNetworkScanResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void triggerEmergencyNetworkScan(int serial, in EmergencyNetworkScanTrigger request);

@@ -475,6 +551,8 @@ oneway interface IRadioNetwork {
     *        otherwise the modem shall resume from the last search.
     *
     * Response function is IRadioEmergencyResponse.cancelEmergencyNetworkScan()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void cancelEmergencyNetworkScan(int serial, boolean resetScan);

@@ -484,6 +562,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of the request.
     *
     * Response function is IRadioEmergencyResponse.exitEmergencyModeResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void exitEmergencyMode(in int serial);

@@ -514,6 +594,8 @@ oneway interface IRadioNetwork {
     *                Otherwise, false.
     *
     * Response callback is IRadioResponse.setNullCipherAndIntegrityEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);

@@ -529,6 +611,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of the request.
     *
     * Response callback is IRadioNetworkResponse.isNullCipherAndIntegrityEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void isNullCipherAndIntegrityEnabled(in int serial);

@@ -538,6 +622,8 @@ oneway interface IRadioNetwork {
     * @param serial Serial number of request.
     *
     * Response function is IRadioNetworkResponse.isN1ModeEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void isN1ModeEnabled(in int serial);

@@ -555,6 +641,8 @@ oneway interface IRadioNetwork {
     * @param enable {@code true} to enable N1 mode, {@code false} to disable N1 mode.
     *
     * Response function is IRadioNetworkResponse.setN1ModeEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.radio.access is defined.
     */
    void setN1ModeEnabled(in int serial, boolean enable);
 }
--- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
+++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
@@ -51,6 +51,8 @@ oneway interface IRadioNetworkResponse {
     * @param networkTypeBitmap a 32-bit bitmap of RadioAccessFamily.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -67,6 +69,8 @@ oneway interface IRadioNetworkResponse {
     * @param bandModes List of RadioBandMode listing supported modes
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -84,6 +88,8 @@ oneway interface IRadioNetworkResponse {
     * @param networkInfos List of network operator information as OperatorInfos
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -104,6 +110,8 @@ oneway interface IRadioNetworkResponse {
     * @param barringInfos a vector of barring info for all barring service types
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -117,6 +125,7 @@ oneway interface IRadioNetworkResponse {
     * @param type CdmaRoamingType
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -135,6 +144,8 @@ oneway interface IRadioNetworkResponse {
     * @param cellInfo List of current cell information known to radio
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -146,6 +157,8 @@ oneway interface IRadioNetworkResponse {
     * @param dataRegResponse Current data registration response as defined by RegStateResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -160,6 +173,7 @@ oneway interface IRadioNetworkResponse {
     * @param ratFamily RadioTechnologyFamily. This value is valid only if isRegistered is true.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -178,6 +192,8 @@ oneway interface IRadioNetworkResponse {
     * @param selection false for automatic selection, true for manual selection
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -197,6 +213,8 @@ oneway interface IRadioNetworkResponse {
     * @param numeric is 5 or 6 digit numeric code (MCC + MNC) or empty string if unregistered
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -213,6 +231,8 @@ oneway interface IRadioNetworkResponse {
     * @param signalStrength Current signal strength
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -224,6 +244,8 @@ oneway interface IRadioNetworkResponse {
     * @param specifiers List of RadioAccessSpecifiers that are scanned.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -237,6 +259,8 @@ oneway interface IRadioNetworkResponse {
     * @param rat Current voice RAT
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -251,6 +275,8 @@ oneway interface IRadioNetworkResponse {
     * @param voiceRegResponse Current Voice registration response as defined by RegStateResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -264,6 +290,8 @@ oneway interface IRadioNetworkResponse {
     *        else false.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -274,6 +302,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -289,6 +319,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
@@ -306,6 +338,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -326,6 +360,7 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -344,6 +379,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -359,6 +396,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:INVALID_ARGUMENTS
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -371,6 +410,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:INVALID_ARGUMENTS
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -382,6 +423,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -399,6 +442,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:ILLEGAL_SIM_OR_ME
@@ -420,6 +465,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:ILLEGAL_SIM_OR_ME
@@ -442,6 +489,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -453,6 +502,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:INVALID_ARGUMENTS
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -463,6 +514,7 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -481,6 +533,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -492,6 +546,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:DEVICE_IN_USE
@@ -505,6 +561,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:INTERNAL_ERR
     *   RadioError:MODEM_ERR
@@ -516,6 +574,8 @@ oneway interface IRadioNetworkResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:PASSWORD_INCORRECT (code is invalid)
@@ -535,6 +595,7 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -549,6 +610,7 @@ oneway interface IRadioNetworkResponse {
     * @param usageSetting the usage setting for the current SIM.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -565,6 +627,8 @@ oneway interface IRadioNetworkResponse {
     * @param regState the current registration state of the modem.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:REQUEST_NOT_SUPPORTED
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -580,6 +644,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:REQUEST_NOT_SUPPORTED
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -595,6 +661,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:REQUEST_NOT_SUPPORTED
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -609,6 +677,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:REQUEST_NOT_SUPPORTED
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -620,6 +690,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MODEM_ERR
@@ -631,6 +703,8 @@ oneway interface IRadioNetworkResponse {
     * @param enabled the last known state of null ciphering and integrity algorithms
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MODEM_ERR
@@ -645,6 +719,8 @@ oneway interface IRadioNetworkResponse {
     * @param isEnabled Indicates whether N1 mode is enabled or not.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -659,6 +735,8 @@ oneway interface IRadioNetworkResponse {
     * @param info Response info struct containing response type, serial no. and error.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.radio.access is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
--- a/radio/aidl/android/hardware/radio/sap/ISap.aidl
+++ b/radio/aidl/android/hardware/radio/sap/ISap.aidl
@@ -28,6 +28,8 @@ oneway interface ISap {
     * @param serial Id to match req-resp. Resp must include same serial.
     * @param type APDU command type
     * @param command CommandAPDU/CommandAPDU7816 parameter depending on type
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void apduReq(in int serial, in SapApduType type, in byte[] command);

@@ -36,6 +38,8 @@ oneway interface ISap {
     *
     * @param serial Id to match req-resp. Resp must include same serial.
     * @param maxMsgSizeBytes MaxMsgSize to be used for SIM Access Profile connection
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void connectReq(in int serial, in int maxMsgSizeBytes);

@@ -43,6 +47,8 @@ oneway interface ISap {
     * DISCONNECT_REQ from SAP 1.1 spec 5.1.3
     *
     * @param serial Id to match req-resp. Resp must include same serial.
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void disconnectReq(in int serial);

@@ -51,6 +57,8 @@ oneway interface ISap {
     *
     * @param serial Id to match req-resp. Resp must include same serial.
     * @param powerOn true for on, false for off
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void powerReq(in int serial, in boolean powerOn);

@@ -58,6 +66,8 @@ oneway interface ISap {
     * RESET_SIM_REQ from SAP 1.1 spec 5.1.14
     *
     * @param serial Id to match req-resp. Resp must include same serial.
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void resetSimReq(in int serial);

@@ -65,6 +75,8 @@ oneway interface ISap {
     * Set callback that has response and unsolicited indication functions
     *
     * @param sapCallback Object containing response and unosolicited indication callbacks
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setCallback(in ISapCallback sapCallback);

@@ -73,6 +85,8 @@ oneway interface ISap {
     *
     * @param serial Id to match req-resp. Resp must include same serial.
     * @param transferProtocol Transport Protocol
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setTransferProtocolReq(in int serial, in SapTransferProtocol transferProtocol);

@@ -80,6 +94,8 @@ oneway interface ISap {
     * TRANSFER_ATR_REQ from SAP 1.1 spec 5.1.8
     *
     * @param serial Id to match req-resp. Resp must include same serial.
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void transferAtrReq(in int serial);

@@ -87,6 +103,8 @@ oneway interface ISap {
     * TRANSFER_CARD_READER_STATUS_REQ from SAP 1.1 spec 5.1.17
     *
     * @param serial Id to match req-resp. Resp must include same serial.
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void transferCardReaderStatusReq(in int serial);
 }
--- a/radio/aidl/android/hardware/radio/sap/ISapCallback.aidl
+++ b/radio/aidl/android/hardware/radio/sap/ISapCallback.aidl
@@ -29,6 +29,8 @@ oneway interface ISapCallback {
     * @param serial Id to match req-resp. Value must match the one in req.
     * @param resultCode ResultCode to indicate if command was processed correctly
     *        Possible values:
+     *        SapResultCode:NOT_SUPPORTED  when android.hardware.telephony.subscription is not
+     *                                     defined
     *        SapResultCode:SUCCESS,
     *        SapResultCode:GENERIC_FAILURE,
     *        SapResultCode:CARD_NOT_ACCESSSIBLE,
@@ -77,6 +79,8 @@ oneway interface ISapCallback {
     * @param serial Id to match req-resp. Value must match the one in req.
     * @param resultCode ResultCode to indicate if command was processed correctly
     *        Possible values:
+     *        SapResultCode:NOT_SUPPORTED  when android.hardware.telephony.subscription is not
+     *                                     defined
     *        SapResultCode:SUCCESS,
     *        SapResultCode:GENERIC_FAILURE,
     *        SapResultCode:CARD_NOT_ACCESSSIBLE, (possible only for power on req)
@@ -92,6 +96,8 @@ oneway interface ISapCallback {
     * @param serial Id to match req-resp. Value must match the one in req.
     * @param resultCode ResultCode to indicate if command was processed correctly
     *        Possible values:
+     *        SapResultCode:NOT_SUPPORTED  when android.hardware.telephony.subscription is not
+     *                                     defined
     *        SapResultCode:SUCCESS,
     *        SapResultCode:GENERIC_FAILURE,
     *        SapResultCode:CARD_NOT_ACCESSSIBLE,
@@ -114,6 +120,8 @@ oneway interface ISapCallback {
     * @param serial Id to match req-resp. Value must match the one in req.
     * @param resultCode ResultCode to indicate if command was processed correctly
     *        Possible values:
+     *        SapResultCode:NOT_SUPPORTED  when android.hardware.telephony.subscription is not
+     *                                     defined
     *        SapResultCode:SUCCESS,
     *        SapResultCode:GENERIC_FAILURE,
     *        SapResultCode:CARD_ALREADY_POWERED_OFF,
@@ -130,6 +138,8 @@ oneway interface ISapCallback {
     * @param serial Id to match req-resp. Value must match the one in req.
     * @param resultCode ResultCode to indicate if command was processed correctly
     *        Possible values:
+     *        SapResultCode:NOT_SUPPORTED  when android.hardware.telephony.subscription is not
+     *                                     defined
     *        SapResultCode:SUCCESS,
     *        SapResultCode:GENERIC_FAILURE
     *        SapResultCode:DATA_NOT_AVAILABLE
@@ -145,6 +155,8 @@ oneway interface ISapCallback {
     * @param serial Id to match req-resp. Value must match the one in req.
     * @param resultCode ResultCode to indicate if command was processed correctly
     *        Possible values:
+     *        SapResultCode:NOT_SUPPORTED  when android.hardware.telephony.subscription is not
+     *                                     defined
     *        SapResultCode:SUCCESS
     *        SapResultCode:NOT_SUPPORTED
     */
--- a/radio/aidl/android/hardware/radio/sim/IRadioSim.aidl
+++ b/radio/aidl/android/hardware/radio/sim/IRadioSim.aidl
@@ -49,6 +49,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.areUiccApplicationsEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void areUiccApplicationsEnabled(in int serial);

@@ -61,6 +63,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.changeIccPin2ForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void changeIccPin2ForApp(in int serial, in String oldPin2, in String newPin2, in String aid);

@@ -73,6 +77,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.changeIccPinForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void changeIccPinForApp(in int serial, in String oldPin, in String newPin, in String aid);

@@ -91,6 +97,8 @@ oneway interface IRadioSim {
     * @param enable true if to enable uiccApplications, false to disable.
     *
     * Response function is IRadioSimResponse.enableUiccApplicationsResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void enableUiccApplications(in int serial, in boolean enable);

@@ -100,6 +108,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.getAllowedCarriersResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getAllowedCarriers(in int serial);

@@ -111,6 +121,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.getCdmaSubscriptionResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void getCdmaSubscription(in int serial);

@@ -120,6 +132,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.getCdmaSubscriptionSourceResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void getCdmaSubscriptionSource(in int serial);

@@ -135,6 +149,8 @@ oneway interface IRadioSim {
     *        This is only applicable in the case of Fixed Dialing Numbers (FDN) requests.
     *
     * Response function is IRadioSimResponse.getFacilityLockForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getFacilityLockForApp(in int serial, in String facility, in String password,
            in int serviceClass, in String appId);
@@ -145,6 +161,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.getIccCardStatusResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getIccCardStatus(in int serial);

@@ -155,6 +173,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.getImsiForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getImsiForApp(in int serial, in String aid);

@@ -164,6 +184,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.getSimPhonebookCapacityResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getSimPhonebookCapacity(in int serial);

@@ -175,6 +197,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.getSimPhonebookRecordsResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void getSimPhonebookRecords(in int serial);

@@ -187,6 +211,8 @@ oneway interface IRadioSim {
     *
     * Response function is IRadioSimResponse.iccCloseLogicalChannelResponse()
     *
+     * This is available when android.hardware.telephony.subscription is defined.
+     *
     * @deprecated use iccCloseLogicalChannelWithSessionInfo instead.
     */
    void iccCloseLogicalChannel(in int serial, in int channelId);
@@ -202,6 +228,8 @@ oneway interface IRadioSim {
     * @param iccIo IccIo
     *
     * Response function is IRadioSimResponse.iccIoForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void iccIoForApp(in int serial, in IccIo iccIo);

@@ -220,6 +248,8 @@ oneway interface IRadioSim {
     * @param p2 P2 value, described in ISO 7816-4. Ignore if equal to RadioConst:P2_CONSTANT_NO_P2
     *
     * Response function is IRadioSimResponse.iccOpenLogicalChannelResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void iccOpenLogicalChannel(in int serial, in String aid, in int p2);

@@ -233,6 +263,8 @@ oneway interface IRadioSim {
     * @param message SimApdu to be sent
     *
     * Response function is IRadioSimResponse.iccTransmitApduBasicChannelResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void iccTransmitApduBasicChannel(in int serial, in SimApdu message);

@@ -245,6 +277,8 @@ oneway interface IRadioSim {
     * @param message SimApdu to be sent
     *
     * Response function is IRadioSimResponse.iccTransmitApduLogicalChannelResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void iccTransmitApduLogicalChannel(in int serial, in SimApdu message);

@@ -254,6 +288,8 @@ oneway interface IRadioSim {
     * @param serial Serial number of request.
     *
     * Response function is IRadioSimResponse.reportStkServiceIsRunningResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void reportStkServiceIsRunning(in int serial);

@@ -267,6 +303,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value
     *
     * Response function is IRadioSimResponse.requestIccSimAuthenticationResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void requestIccSimAuthentication(
            in int serial, in int authContext, in String authData, in String aid);
@@ -275,6 +313,8 @@ oneway interface IRadioSim {
     * When response type received from a radio indication or radio response is
     * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
     * acknowledge the receipt of those messages by sending responseAcknowledgement().
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void responseAcknowledgement();

@@ -286,6 +326,8 @@ oneway interface IRadioSim {
     * @param contents SAT/USAT command in hexadecimal format string starting with command tag
     *
     * Response function is IRadioSimResponse.sendEnvelopeResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void sendEnvelope(in int serial, in String contents);

@@ -301,6 +343,8 @@ oneway interface IRadioSim {
     * @param contents SAT/USAT command in hexadecimal format starting with command tag
     *
     * Response function is IRadioSimResponse.sendEnvelopeWithStatusResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void sendEnvelopeWithStatus(in int serial, in String contents);

@@ -312,6 +356,8 @@ oneway interface IRadioSim {
     *        first byte of response data
     *
     * Response function is IRadioSimResponse.sendTerminalResponseResponseToSim()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void sendTerminalResponseToSim(in int serial, in String contents);

@@ -331,6 +377,8 @@ oneway interface IRadioSim {
     * @param multiSimPolicy Policy to be used for devices with multiple SIMs.
     *
     * Response function is IRadioSimResponse.setAllowedCarriersResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setAllowedCarriers(in int serial, in CarrierRestrictions carriers,
            in SimLockMultiSimPolicy multiSimPolicy);
@@ -344,6 +392,8 @@ oneway interface IRadioSim {
     * @param imsiEncryptionInfo ImsiEncryptionInfo
     *
     * Response function is IRadioSimResponse.setCarrierInfoForImsiEncryptionResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setCarrierInfoForImsiEncryption(in int serial, in ImsiEncryptionInfo imsiEncryptionInfo);

@@ -354,6 +404,8 @@ oneway interface IRadioSim {
     * @param cdmaSub CdmaSubscriptionSource
     *
     * Response function is IRadioSimResponse.setCdmaSubscriptionSourceResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void setCdmaSubscriptionSource(in int serial, in CdmaSubscriptionSource cdmaSub);

@@ -370,6 +422,8 @@ oneway interface IRadioSim {
     *        This is only applicable in the case of Fixed Dialing Numbers (FDN) requests.
     *
     * Response function is IRadioSimResponse.setFacilityLockForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setFacilityLockForApp(in int serial, in String facility, in boolean lockState,
            in String password, in int serviceClass, in String appId);
@@ -379,6 +433,8 @@ oneway interface IRadioSim {
     *
     * @param radioSimResponse Object containing response functions
     * @param radioSimIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setResponseFunctions(
            in IRadioSimResponse radioSimResponse, in IRadioSimIndication radioSimIndication);
@@ -409,6 +465,8 @@ oneway interface IRadioSim {
     *                POWER_UP_PASS_THROUGH if powering up the SIM card in pass through mode
     *
     * Response function is IRadioSimResponse.setSimCardPowerResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setSimCardPower(in int serial, in CardPowerState powerUp);

@@ -419,6 +477,8 @@ oneway interface IRadioSim {
     * @param uiccSub SelectUiccSub
     *
     * Response function is IRadioSimResponse.setUiccSubscriptionResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void setUiccSubscription(in int serial, in SelectUiccSub uiccSub);

@@ -431,6 +491,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.supplyIccPin2ForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void supplyIccPin2ForApp(in int serial, in String pin2, in String aid);

@@ -442,6 +504,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.supplyIccPinForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void supplyIccPinForApp(in int serial, in String pin, in String aid);

@@ -454,6 +518,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.supplyIccPuk2ForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void supplyIccPuk2ForApp(in int serial, in String puk2, in String pin2, in String aid);

@@ -466,6 +532,8 @@ oneway interface IRadioSim {
     * @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value.
     *
     * Response function is IRadioSimResponse.supplyIccPukForAppResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void supplyIccPukForApp(in int serial, in String puk, in String pin, in String aid);

@@ -481,6 +549,8 @@ oneway interface IRadioSim {
     * @param controlKey the unlock code for removing persoType personalization from this device
     *
     * Response function is IRadioSimResponse.supplySimDepersonalizationResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void supplySimDepersonalization(
            in int serial, in PersoSubstate persoType, in String controlKey);
@@ -496,6 +566,8 @@ oneway interface IRadioSim {
     * @param recordInfo Details of the record to insert, delete or update.
     *
     * Response function is IRadioSimResponse.updateSimPhonebookRecordsResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void updateSimPhonebookRecords(in int serial, in PhonebookRecordInfo recordInfo);

@@ -511,6 +583,8 @@ oneway interface IRadioSim {
     * @param sessionInfo Details of the opened logical channel info like sessionId and isEs10.
     *
     * Response function is IRadioSimResponse.iccCloseLogicalChannelWithSessionInfoResponse()
+     *
+     * This is available when android.hardware.telephony.subscription is defined.
     */
    void iccCloseLogicalChannelWithSessionInfo(in int serial, in SessionInfo sessionInfo);
 }
--- a/radio/aidl/android/hardware/radio/sim/IRadioSimResponse.aidl
+++ b/radio/aidl/android/hardware/radio/sim/IRadioSimResponse.aidl
@@ -45,6 +45,8 @@ oneway interface IRadioSimResponse {
     * @param enabled whether Uicc applications are enabled.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:SIM_ABSENT
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -57,6 +59,8 @@ oneway interface IRadioSimResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:PASSWORD_INCORRECT (old PIN2 is invalid)
@@ -75,6 +79,8 @@ oneway interface IRadioSimResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:PASSWORD_INCORRECT
@@ -91,6 +97,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:SIM_ABSENT
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -105,6 +113,8 @@ oneway interface IRadioSimResponse {
     * @param multiSimPolicy Policy used for devices with multiple SIM cards.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     */
@@ -122,6 +132,7 @@ oneway interface IRadioSimResponse {
     * @param prl PRL version if CDMA subscription is available
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SUBSCRIPTION_NOT_AVAILABLE
@@ -143,6 +154,7 @@ oneway interface IRadioSimResponse {
     * @param source CDMA subscription source
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SUBSCRIPTION_NOT_AVAILABLE
@@ -161,6 +173,8 @@ oneway interface IRadioSimResponse {
     *        specified barring facility is active. "0" means "disabled for all"
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -182,6 +196,8 @@ oneway interface IRadioSimResponse {
     * @param cardStatus ICC card status as defined by CardStatus
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -194,6 +210,8 @@ oneway interface IRadioSimResponse {
     * @param imsi String containing the IMSI
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:INTERNAL_ERR
@@ -210,6 +228,8 @@ oneway interface IRadioSimResponse {
     * @param capacity Response capacity enum indicating response processing status
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -223,6 +243,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -236,6 +258,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -252,6 +276,8 @@ oneway interface IRadioSimResponse {
     * @param iccIo ICC IO operation response
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_PIN2
@@ -272,6 +298,8 @@ oneway interface IRadioSimResponse {
     *        byte per integer
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MISSING_RESOURCE
@@ -292,6 +320,8 @@ oneway interface IRadioSimResponse {
     * @param result IccIoResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -306,6 +336,8 @@ oneway interface IRadioSimResponse {
     * @param result IccIoResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -319,6 +351,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -333,6 +367,8 @@ oneway interface IRadioSimResponse {
     * @param result IccIoResult
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
@@ -351,6 +387,8 @@ oneway interface IRadioSimResponse {
     *        byte of response
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_BUSY
@@ -370,6 +408,8 @@ oneway interface IRadioSimResponse {
     * @param iccIo IccIoResult corresponding to ICC IO response
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_BUSY
@@ -386,6 +426,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -403,6 +445,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -413,6 +457,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_ABSENT
@@ -425,6 +471,7 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_ABSENT
@@ -441,6 +488,8 @@ oneway interface IRadioSimResponse {
     * @param retry 0 is the number of retries remaining, or -1 if unknown
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -463,6 +512,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -474,6 +525,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SUBSCRIPTION_NOT_SUPPORTED
@@ -492,6 +545,8 @@ oneway interface IRadioSimResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:PASSWORD_INCORRECT
@@ -510,6 +565,8 @@ oneway interface IRadioSimResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:PASSWORD_INCORRECT
@@ -527,6 +584,8 @@ oneway interface IRadioSimResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:PASSWORD_INCORRECT (PUK is invalid)
@@ -544,6 +603,8 @@ oneway interface IRadioSimResponse {
     * @param remainingRetries Number of retries remaining, must be equal to -1 if unknown.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:PASSWORD_INCORRECT (PUK is invalid)
@@ -563,6 +624,8 @@ oneway interface IRadioSimResponse {
     *        to -1 if number of retries is infinite.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:PASSWORD_INCORRECT (code is invalid)
@@ -583,6 +646,8 @@ oneway interface IRadioSimResponse {
     *        the minimum value is 1
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -599,6 +664,8 @@ oneway interface IRadioSimResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.subscription is not
+     *                                    defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
--- a/radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl
+++ b/radio/aidl/android/hardware/radio/voice/IRadioVoice.aidl
@@ -41,6 +41,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.acceptCallResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void acceptCall(in int serial);

@@ -50,6 +52,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.cancelPendingUssdResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void cancelPendingUssd(in int serial);

@@ -59,6 +63,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.conferenceResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void conference(in int serial);

@@ -69,6 +75,8 @@ oneway interface IRadioVoice {
     * @param dialInfo Dial struct
     *
     * Response function is IRadioVoiceResponse.dialResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void dial(in int serial, in Dial dialInfo);

@@ -125,6 +133,8 @@ oneway interface IRadioVoice {
     * @param isTesting Flag indicating if this request is for testing purpose.
     *
     * Response function is IRadioVoiceResponse.emergencyDialResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void emergencyDial(in int serial, in Dial dialInfo, in int categories, in String[] urns,
            in EmergencyCallRouting routing, in boolean hasKnownUserIntentEmergency,
@@ -137,6 +147,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.exitEmergencyCallbackModeResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void exitEmergencyCallbackMode(in int serial);

@@ -146,6 +158,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.explicitCallTransferResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void explicitCallTransfer(in int serial);

@@ -156,6 +170,8 @@ oneway interface IRadioVoice {
     * @param callInfo CallForwardInfo
     *
     * Response function is IRadioVoiceResponse.getCallForwardStatusResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getCallForwardStatus(in int serial, in CallForwardInfo callInfo);

@@ -166,6 +182,8 @@ oneway interface IRadioVoice {
     * @param serviceClass Service class is the TS 27.007 service class to query
     *
     * Response function is IRadioVoiceResponse.getCallWaitingResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getCallWaiting(in int serial, in int serviceClass);

@@ -175,6 +193,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getClipResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getClip(in int serial);

@@ -184,6 +204,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getClirResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getClir(in int serial);

@@ -193,6 +215,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getCurrentCallsResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getCurrentCalls(in int serial);

@@ -202,6 +226,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getLastCallFailCauseResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getLastCallFailCause(in int serial);

@@ -211,6 +237,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getMuteResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getMute(in int serial);

@@ -220,6 +248,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getPreferredVoicePrivacyResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getPreferredVoicePrivacy(in int serial);

@@ -229,6 +259,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.getTtyModeResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void getTtyMode(in int serial);

@@ -241,6 +273,8 @@ oneway interface IRadioVoice {
     * @param accept true = accept the call setup, false = reject the call setup
     *
     * Response function is IRadioVoiceResponse.handleStkCallSetupRequestFromSimResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void handleStkCallSetupRequestFromSim(in int serial, in boolean accept);

@@ -252,6 +286,8 @@ oneway interface IRadioVoice {
     * @param gsmIndex Connection index (value of 'x' in CHLD above)
     *
     * Response function is IRadioVoiceResponse.hangupResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void hangup(in int serial, in int gsmIndex);

@@ -262,6 +298,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.hangupForegroundResumeBackgroundResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void hangupForegroundResumeBackground(in int serial);

@@ -272,6 +310,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.hangupWaitingOrBackgroundResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void hangupWaitingOrBackground(in int serial);

@@ -281,6 +321,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.isVoNrEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void isVoNrEnabled(in int serial);

@@ -290,6 +332,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.rejectCallResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void rejectCall(in int serial);

@@ -297,6 +341,8 @@ oneway interface IRadioVoice {
     * When response type received from a radio indication or radio response is
     * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
     * acknowledge the receipt of those messages by sending responseAcknowledgement().
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void responseAcknowledgement();

@@ -309,6 +355,8 @@ oneway interface IRadioVoice {
     * @param off is the DTMF OFF length in milliseconds, or 0 to use default
     *
     * Response function is IRadioVoiceResponse.sendBurstDtmfResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void sendBurstDtmf(in int serial, in String dtmf, in int on, in int off);

@@ -319,6 +367,8 @@ oneway interface IRadioVoice {
     * @param featureCode String associated with Flash command
     *
     * Response function is IRadioVoiceResponse.sendCdmaFeatureCodeResponse()
+     *
+     * This is available when android.hardware.telephony.cdma is defined.
     */
    void sendCdmaFeatureCode(in int serial, in String featureCode);

@@ -330,6 +380,8 @@ oneway interface IRadioVoice {
     * @param s string with single char having one of 12 values: 0-9, *, #
     *
     * Response function is IRadioVoiceResponse.sendDtmfResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void sendDtmf(in int serial, in String s);

@@ -347,6 +399,8 @@ oneway interface IRadioVoice {
     * @param ussd string containing the USSD request in UTF-8 format
     *
     * Response function is IRadioVoiceResponse.sendUssdResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void sendUssd(in int serial, in String ussd);

@@ -363,6 +417,8 @@ oneway interface IRadioVoice {
     * @param gsmIndex contains Connection index (value of 'x' in CHLD above)
     *
     * Response function is IRadioVoiceResponse.separateConnectionResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void separateConnection(in int serial, in int gsmIndex);

@@ -373,6 +429,8 @@ oneway interface IRadioVoice {
     * @param callInfo CallForwardInfo
     *
     * Response function is IRadioVoiceResponse.setCallForwardResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setCallForward(in int serial, in CallForwardInfo callInfo);

@@ -384,6 +442,8 @@ oneway interface IRadioVoice {
     * @param serviceClass is the TS 27.007 service class bit vector of services to modify
     *
     * Response function is IRadioVoiceResponse.setCallWaitingResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setCallWaiting(in int serial, in boolean enable, in int serviceClass);

@@ -394,6 +454,8 @@ oneway interface IRadioVoice {
     * @param status "n" parameter from TS 27.007 7.7
     *
     * Response function is IRadioVoiceResponse.setClirResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setClir(in int serial, in int status);

@@ -405,6 +467,8 @@ oneway interface IRadioVoice {
     * @param enable true for "enable mute" and false for "disable mute"
     *
     * Response function is IRadioVoiceResponse.setMuteResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setMute(in int serial, in boolean enable);

@@ -416,6 +480,8 @@ oneway interface IRadioVoice {
     *        true for Enhanced Privacy Mode (Private Long Code Mask)
     *
     * Response function is IRadioVoiceResponse.setPreferredVoicePrivacyResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setPreferredVoicePrivacy(in int serial, in boolean enable);

@@ -424,6 +490,8 @@ oneway interface IRadioVoice {
     *
     * @param radioVoiceResponse Object containing response functions
     * @param radioVoiceIndication Object containing radio indications
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setResponseFunctions(in IRadioVoiceResponse radioVoiceResponse,
            in IRadioVoiceIndication radioVoiceIndication);
@@ -435,6 +503,8 @@ oneway interface IRadioVoice {
     * @param mode TtyMode
     *
     * Response function is IRadioVoiceResponse.setTtyModeResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void setTtyMode(in int serial, in TtyMode mode);

@@ -445,6 +515,8 @@ oneway interface IRadioVoice {
     * @param enable true for "enable vonr" and false for "disable vonr"
     *
     * Response function is IRadioVoiceResponse.setVoNrEnabledResponse()
+     *
+     * This is available when android.hardware.telephony.ims is defined.
     */
    void setVoNrEnabled(in int serial, in boolean enable);

@@ -457,6 +529,8 @@ oneway interface IRadioVoice {
     * @param s string having a single character with one of 12 values: 0-9,*,#
     *
     * Response function is IRadioVoiceResponse.startDtmfResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void startDtmf(in int serial, in String s);

@@ -466,6 +540,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.stopDtmfResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void stopDtmf(in int serial);

@@ -483,6 +559,8 @@ oneway interface IRadioVoice {
     * @param serial Serial number of request.
     *
     * Response function is IRadioVoiceResponse.switchWaitingOrHoldingAndActiveResponse()
+     *
+     * This is available when android.hardware.telephony.calling is defined.
     */
    void switchWaitingOrHoldingAndActive(in int serial);
 }
--- a/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl
+++ b/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl
@@ -33,6 +33,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_STATE
@@ -61,6 +62,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SIM_BUSY
@@ -81,6 +83,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:NO_MEMORY
@@ -101,6 +104,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:DIAL_MODIFIED_TO_USSD
@@ -129,6 +133,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:DIAL_MODIFIED_TO_USSD
@@ -152,6 +157,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NO_ALLOWED
@@ -170,6 +176,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -196,6 +203,7 @@ oneway interface IRadioVoiceResponse {
     *        CallForwardInfo must be returned with the service class set to "data + voice = 3".
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -223,6 +231,7 @@ oneway interface IRadioVoiceResponse {
     *        for data and voice and disabled for everything else.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -245,6 +254,7 @@ oneway interface IRadioVoiceResponse {
     * @param status indicates CLIP status
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -264,6 +274,7 @@ oneway interface IRadioVoiceResponse {
     * @param m is "m" parameter from TS 27.007 7.7
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -285,6 +296,7 @@ oneway interface IRadioVoiceResponse {
     * @param calls Current call list
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NO_MEMORY
     *   RadioError:INTERNAL_ERR
     *   RadioError:SYSTEM_ERR
@@ -327,6 +339,7 @@ oneway interface IRadioVoiceResponse {
     * for tone generation or error notification.
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:NO_MEMORY
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -346,6 +359,7 @@ oneway interface IRadioVoiceResponse {
     * @param enable true for "mute enabled" and false for "mute disabled"
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -367,6 +381,7 @@ oneway interface IRadioVoiceResponse {
     *        true for Enhanced Privacy Mode (Private Long Code Mask)
     *
     * Valid errors:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -384,6 +399,7 @@ oneway interface IRadioVoiceResponse {
     * @param mode TtyMode
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -400,6 +416,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:NO_MEMORY
@@ -417,6 +434,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:INVALID_ARGUMENTS
@@ -434,6 +452,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:INVALID_STATE
@@ -454,6 +473,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:INVALID_STATE
@@ -474,6 +494,7 @@ oneway interface IRadioVoiceResponse {
     * @param enable true for "vonr enabled" and false for "vonr disabled"
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.ims is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:MODEM_ERR
@@ -486,6 +507,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:INVALID_STATE
@@ -507,6 +529,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -527,6 +550,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.cdma is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -547,6 +571,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -565,6 +590,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:FDN_CHECK_FAILURE
@@ -590,6 +616,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -610,6 +637,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -632,6 +660,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:SS_MODIFIED_TO_DIAL
@@ -654,6 +683,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:INVALID_ARGUMENTS
     *   RadioError:RADIO_NOT_AVAILABLE
@@ -672,6 +702,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -688,6 +719,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -705,6 +737,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -721,6 +754,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -734,6 +768,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -753,6 +788,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INVALID_ARGUMENTS
@@ -772,6 +808,7 @@ oneway interface IRadioVoiceResponse {
     * @param info Response info struct containing response type, serial no. and error
     *
     * Valid errors returned:
+     *   RadioError:REQUEST_NOT_SUPPORTED when android.hardware.telephony.calling is not defined
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)
     *   RadioError:INVALID_STATE