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

Commit cc4832fb authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "IRADIO_HAL_1_4" 

* changes:
  Migration of IRadio 1.3 types to 1.4.
  Migration of IRadio 1.3 types to 1.4.
parents 88e2f996 193a6f3c

radio/1.3/Android.bp

+0 −20
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ hidl_interface { 
        enabled: true,

    },

    srcs: [

        "types.hal",

        "IRadio.hal",

        "IRadioIndication.hal",

        "IRadioResponse.hal",
@@ -17,25 +16,6 @@ hidl_interface { 
        "android.hardware.radio@1.1",

        "android.hardware.radio@1.2",

        "android.hidl.base@1.0",

        "android.hidl.safe_union@1.0",

    ],

    types: [

        "AccessNetwork",

        "CellConfigLte",

        "CellInfo",

        "CellInfoLte",

        "CardStatus",

        "DataProfileInfo",

        "DataRegStateResult",

        "EmergencyNumber",

        "EmergencyNumberSource",

        "EmergencyServiceCategory",

        "FrequencyRange",

        "RadioFrequencyInfo",

        "RadioTechnology",

        "PhysicalChannelConfig",

        "LteVopsInfo",

        "NetworkScanResult",

    ],

    gen_java: true,

}

radio/1.3/IRadio.hal

+0 −95
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ 


package android.hardware.radio@1.3;



import @1.3::DataProfileInfo;

import @1.0::Dial;

import @1.2::DataRequestReason;

import @1.2::IRadio;

import @1.3::AccessNetwork;

import @1.3::EmergencyServiceCategory;



/**

 * This interface is used by telephony and telecom to talk to cellular radio.
@@ -32,94 +27,4 @@ import @1.3::EmergencyServiceCategory; 
 * setResponseFunctions must work with @1.1::IRadioResponse and @1.1::IRadioIndication.

 */

interface IRadio extends @1.2::IRadio {

    /**

     * Setup a packet data connection. If DataCallResponse.status returns DataCallFailCause:NONE,

     * the data connection must be added to data calls and a unsolDataCallListChanged() must be

     * sent. The call remains until removed by subsequent unsolDataCallIstChanged(). It may be

     * lost due to many factors, including deactivateDataCall() being issued, the radio powered

     * off, reception lost or even transient factors like congestion. This data call list is

     * returned by getDataCallList() and dataCallListChanged().

     *

     * The Radio is expected to:

     *   - Create one data call context.

     *   - Create and configure a dedicated interface for the context.

     *   - The interface must be point to point.

     *   - The interface is configured with one or more addresses and is capable of sending and

     *     receiving packets. The prefix length of the addresses must be /32 for IPv4 and /128

     *     for IPv6.

     *   - Must not modify routing configuration related to this interface; routing management is

     *     exclusively within the purview of the Android OS.

     *   - Support simultaneous data call contexts up to DataRegStateResult.maxDataCalls specified

     *     in the response of getDataRegistrationState.

     *

     * @param serial Serial number of request.

     * @param accessNetwork The access network to setup the data call. If the data connection cannot

     *     be established on the specified access network, the setup request must be failed.

     * @param dataProfileInfo Data profile info.

     * @param roamingAllowed Indicates whether or not data roaming is allowed by the user.

     * @param reason The request reason. Must be DataRequestReason.NORMAL or

     *     DataRequestReason.HANDOVER.

     * @param addresses If the reason is DataRequestReason.HANDOVER, this indicates the list of link

     *     addresses of the existing data connection. The format is IP address with optional "/"

     *     prefix length (The format is defined in RFC-4291 section 2.3). For example, "192.0.1.3",

     *     "192.0.1.11/16", or "2001:db8::1/64". Typically one IPv4 or one IPv6 or one of each. If

     *     the prefix length is absent, then the addresses are assumed to be point to point with

     *     IPv4 with prefix length 32 or IPv6 with prefix length 128. This parameter must be ignored

     *     unless reason is DataRequestReason.HANDOVER.

     * @param dnses If the reason is DataRequestReason.HANDOVER, this indicates the list of DNS

     *     addresses of the existing data connection. The format is defined in RFC-4291 section

     *     2.2. For example, "192.0.1.3" or "2001:db8::1". This parameter must be ignored unless

     *     reason is DataRequestReason.HANDOVER.

     *

     * Response function is IRadioResponse.setupDataCallResponse()

     *

     * Note this API is same as 1.2 version except using the 1.3 AccessNetwork as the input param.

     */

    oneway setupDataCall_1_3(int32_t serial, AccessNetwork accessNetwork,

            DataProfileInfo dataProfileInfo, bool roamingAllowed,

            DataRequestReason reason, vec<string> addresses, vec<string> dnses);



    /**

     * Set an apn to initial attach network

     *

     * @param serial Serial number of request.

     * @param dataProfileInfo data profile containing APN settings

     *

     * Response callback is IRadioResponse.setInitialAttachApnResponse()

     */

    oneway setInitialAttachApn_1_3(int32_t serial, DataProfileInfo dataProfileInfo);



    /**

     * Send data profiles of the current carrier to the modem.

     *

     * @param serial Serial number of request.

     * @param profiles Array of DataProfile to set.

     *

     * Response callback is IRadioResponse.setDataProfileResponse()

     */

    oneway setDataProfile_1_3(int32_t serial, vec<DataProfileInfo> profiles);



    /**

     * Initiate emergency voice call, with zero or more emergency service category(s).

     *

     * Note this API is the same as IRadio.dial except using the

     * @1.3::EmergencyServiceCategory as the input param.

     *

     * If the dialed emergency number does not have a specified emergency service category, the

     * 'categories' field is set to @1.3::EmergencyServiceCategory#UNSPECIFIED; iff either the

     * 'categories' field is set to @1.3::EmergencyServiceCategory#UNSPECIFIED or the underlying

     * technology used to request emergency services does not support the emergency service

     * category, the interpretation of the categories is defined by implementation.

     *

     * Reference: 3gpp TS 22.101, Section 10 - Emergency Calls

     *

     * @param serial Serial number of request.

     * @param dialInfo the same @1.0::Dial information used by @1.0::IRadio.dial.

     * @param categories bitfield<@1.3::EmergencyServiceCategory> the Emergency Service Category(s)

     *     of the call.

     *

     * Response function is IRadioResponse.emergencyDialResponse()

     */

    oneway emergencyDial(int32_t serial, Dial dialInfo,

            bitfield<EmergencyServiceCategory> categories);

};

radio/1.3/IRadioIndication.hal

+0 −51
Original line number Diff line number Diff line
@@ -16,61 +16,10 @@ 


package android.hardware.radio@1.3;



import @1.0::RadioIndicationType;

import @1.2::IRadioIndication;



/**

 * Interface declaring unsolicited radio indications.

 */

interface IRadioIndication extends @1.2::IRadioIndication {

    /**

     * Report the current list of emergency numbers

     *

     * Each emergency number (@1.3::EmergencyNumber) in the emergency number list contains a

     * dialing number, zero or more service category(s), mobile country code, and source(s) that

     * indicate where it comes from.

     *

     * Radio must report all the valid emergency numbers with known mobile country code and

     * emergency service categories from all available sources including network signaling, sim,

     * modem/oem configuration, and default configuration (112 and 911 must be always available;

     * additionally, 000, 08, 110, 999, 118 and 119 must be available when sim is not present).

     * Radio shall not report emergency numbers that are invalid in the current locale. The

     * reported emergency number list must not have duplicate @1.3::EmergencyNumber entries. Please

     * refer the documentation of @1.3::EmergencyNumber to construct each emergency number to

     * report.

     *

     * Radio must report the complete list of emergency numbers whenever the emergency numbers in

     * the list are changed or whenever the client and the radio server are connected.

     *

     * Reference: 3gpp 22.101, Section 10 - Emergency Calls

     *

     * @param type Type of radio indication

     * @param emergencyNumberList Current list of emergency numbers known to radio.

     */

    oneway currentEmergencyNumberList(RadioIndicationType type,

            vec<EmergencyNumber> emergencyNumberList);



    /**

     * Request all of the current cell information known to the radio.

     *

     * @param type Type of radio indication

     * @param records Current cell information

     */

    oneway cellInfoList_1_3(RadioIndicationType type, vec<CellInfo> records);



    /**

     * Incremental network scan results

     */

    oneway networkScanResult_1_3(RadioIndicationType type, NetworkScanResult result);



    /**

     * Indicates physical channel configurations.

     *

     * An empty configs list indicates that the radio is in idle mode.

     *

     * @param type Type of radio indication

     * @param configs Vector of PhysicalChannelConfigs

     */

    oneway currentPhysicalChannelConfigs_1_3(RadioIndicationType type,

            vec<PhysicalChannelConfig> configs);

};

radio/1.3/IRadioResponse.hal

+0 −65
Original line number Diff line number Diff line
@@ -16,75 +16,10 @@ 


package android.hardware.radio@1.3;



import @1.0::RadioResponseInfo;

import @1.2::IRadioResponse;



/**

 * Interface declaring response functions to solicited radio requests.

 */

interface IRadioResponse extends @1.2::IRadioResponse {

    /**

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

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)

     *   RadioError:DIAL_MODIFIED_TO_USSD

     *   RadioError:DIAL_MODIFIED_TO_SS

     *   RadioError:DIAL_MODIFIED_TO_DIAL

     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:NO_MEMORY

     *   RadioError:NO_RESOURCES

     *   RadioError:INTERNAL_ERR

     *   RadioError:FDN_CHECK_FAILURE

     *   RadioError:MODEM_ERR

     *   RadioError:NO_SUBSCRIPTION

     *   RadioError:NO_NETWORK_FOUND

     *   RadioError:INVALID_CALL_ID

     *   RadioError:DEVICE_IN_USE

     *   RadioError:ABORTED

     *   RadioError:INVALID_MODEM_STATE

     *   RadioError:CANCELLED

     */

    oneway emergencyDialResponse(RadioResponseInfo info);



    /**

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

     * @param cellInfo List of current cell information known to radio

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INTERNAL_ERR

     */

    oneway getCellInfoListResponse_1_3(RadioResponseInfo info, vec<CellInfo> cellInfo);



    /**

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

     * @param dataRegResponse Current Data registration response as defined by DataRegStateResult in

     *        types.hal

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INTERNAL_ERR

     *   RadioError:NOT_PROVISIONED

     */

    oneway getDataRegistrationStateResponse_1_3(RadioResponseInfo info,

            DataRegStateResult dataRegResponse);



    /**

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

     * @param cardStatus ICC card status as defined by CardStatus in types.hal

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INTERNAL_ERR

     *   RadioError:NO_MEMORY

     *   RadioError:NO_RESOURCES

     *   RadioError:CANCELLED

     *   RadioError:REQUEST_NOT_SUPPORTED

     */

    oneway getIccCardStatusResponse_1_3(RadioResponseInfo info, CardStatus cardStatus);

};

radio/1.4/Android.bp

0 → 100644
+43 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.radio@1.4",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

        "IRadio.hal",

        "IRadioIndication.hal",

        "IRadioResponse.hal",

    ],

    interfaces: [

        "android.hardware.radio@1.0",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.2",

        "android.hardware.radio@1.3",

        "android.hidl.base@1.0",

        "android.hidl.safe_union@1.0",

    ],

    types: [

        "AccessNetwork",

        "CellConfigLte",

        "CellInfo",

        "CellInfoLte",

        "CardStatus",

        "DataProfileInfo",

        "DataRegStateResult",

        "EmergencyNumber",

        "EmergencyNumberSource",

        "EmergencyServiceCategory",

        "FrequencyRange",

        "RadioFrequencyInfo",

        "RadioTechnology",

        "PhysicalChannelConfig",

        "LteVopsInfo",

        "NetworkScanResult",

    ],

    gen_java: true,

}