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

Commit c181c279 authored by Zoey Chen's avatar Zoey Chen
Browse files

[ANAPIC Review] Modify radio 1.6 based on ANAPIC comment 

 - setupDataCall_1_6, remove "same as 1.5" comment
 - sendSMSExpectMore to sendSmsExpectMore
 - getAllowedNetworkTypesBitmap should use int32_t
 - csiCqiReport uses uint8_t
 - cellBandwidthDownlinkKhz and cellBandwidthUplinkKhz
 - AccessTechnologySpecificInfo, remove these struct NgranRegistrationInfo and GeranRegistrationInfo

Bug: 183738486
Test: make
Change-Id: Icae28d68831bbd01836b8d464e8ece134a9aa63d
parent c99bf00d

radio/1.6/IRadio.hal

+4 −5
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ interface IRadio extends @1.5::IRadio { 
     *

     * Response function is IRadioResponse.setupDataCallResponse_1_6()

     *

     * Note this API is the same as the 1.5

     */

    oneway setupDataCall_1_6(int32_t serial, AccessNetwork accessNetwork,

            DataProfileInfo dataProfileInfo, bool roamingAllowed,
@@ -177,7 +176,7 @@ interface IRadio extends @1.5::IRadio { 
     * @param serial Serial number of request.

     * @param message GsmSmsMessage as defined in types.hal

     *

     * Response function is IRadioResponse.sendSMSExpectMoreResponse_1_6()

     * Response function is IRadioResponse.sendSmsExpectMoreResponse_1_6()

     *

     * Note this API is the same as the 1.0

     *
@@ -185,7 +184,7 @@ interface IRadio extends @1.5::IRadio { 
     * fails. RadioError:SMS_SEND_FAIL_RETRY means retry (i.e. error cause is 332)

     * and RadioError:GENERIC_FAILURE means no retry (i.e. error cause is 500)

     */

    oneway sendSMSExpectMore_1_6(int32_t serial, GsmSmsMessage message);

    oneway sendSmsExpectMore_1_6(int32_t serial, GsmSmsMessage message);



    /**

     * Send a CDMA SMS message
@@ -267,7 +266,7 @@ interface IRadio extends @1.5::IRadio { 
     * 2. Disable NR dual connectivity {NrDualConnectivityState:DISABLE}

     * 3. Disable NR dual connectivity and force secondary cell to be released

     * {NrDualConnectivityState:DISABLE_IMMEDIATE}



     *

     * Response callback is IRadioResponse.setNRDualConnectivityStateResponse()

     */

    oneway setNrDualConnectivityState(int32_t serial,
@@ -372,7 +371,7 @@ interface IRadio extends @1.5::IRadio { 
     *

     * Response callback is IRadioResponse.getAllowedNetworkTypesBitmapResponse()

     */

    oneway getAllowedNetworkTypesBitmap(uint32_t serial);

    oneway getAllowedNetworkTypesBitmap(int32_t serial);



    /**

     * Control data throttling at modem.

radio/1.6/IRadioResponse.hal

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     *   RadioError:ACCESS_BARRED

     *   RadioError:BLOCKED_DUE_TO_CALL

     */

    oneway sendSMSExpectMoreResponse_1_6(RadioResponseInfo info, SendSmsResult sms);

    oneway sendSmsExpectMoreResponse_1_6(RadioResponseInfo info, SendSmsResult sms);



    /**

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

radio/1.6/types.hal

+29 −32
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ import android.hidl.safe_union@1.0::Monostate; 


struct QosBandwidth {

    /** Maximum bit rate possible on the bearer */

    int32_t maxBitrateKbps;

    uint32_t maxBitrateKbps;

    /** Minimum bit rate that is guaranteed to be provided by the network */

    int32_t guaranteedBitrateKbps;

    uint32_t guaranteedBitrateKbps;

};



/** LTE/EPS Quality of Service parameters as per 3gpp spec 24.301 sec 9.9.4.3. */
@@ -106,7 +106,7 @@ safe_union Qos { 
/**

 * Next header protocol numbers defined by IANA, RFC 5237

 */

enum QosProtocol : int32_t {

enum QosProtocol : int8_t {

    /** No protocol specified */

    UNSPECIFIED = -1,

    /** Transmission Control Protocol */
@@ -119,14 +119,14 @@ enum QosProtocol : int32_t { 
    AH = 51,

};



enum QosFilterDirection : int32_t {

enum QosFilterDirection : int8_t {

    DOWNLINK = 0,

    UPLINK = 1,

    BIDIRECTIONAL = 2,

};



/** Allowed port numbers */

enum QosPortRange : int32_t {

enum QosPortRange : uint16_t {

    MIN = 20,

    MAX = 65535

};
@@ -248,7 +248,7 @@ struct QosSession { 
};



/** The allowed failure modes on an IWLAN handover failure. */

enum HandoverFailureMode : int32_t {

enum HandoverFailureMode : int8_t {

    /**

     * On data handover failure, fallback to the source data transport when the

     * fail cause is due to a hand off preference change.
@@ -379,7 +379,7 @@ struct SetupDataCallResult { 
/**

 * NR Dual connectivity state

 */

enum NrDualConnectivityState: int32_t {

enum NrDualConnectivityState: int8_t {

    /**

     * Enable NR dual connectivity. Enabled state does not mean dual connectivity

     * is active. It means device is allowed to connect to both primary and secondary.
@@ -443,7 +443,7 @@ struct LinkCapacityEstimate { 
   uint32_t secondaryUplinkCapacityKbps;

};



enum DataThrottlingAction : int32_t {

enum DataThrottlingAction : int8_t {

    /* Clear all existing data throttling. */

    NO_DATA_THROTTLING = 0,
@@ -581,9 +581,9 @@ struct NrSignalStrength { 
     *

     * Reference: 3GPP TS 138.214 section 5.2.2.1.

     *

     * Range [0, 15], INT_MAX means invalid/unreported.

     * Range [0, 15], 0xFF means invalid/unreported.

     */

    vec<uint32_t> csiCqiReport;

    vec<uint8_t> csiCqiReport;

};



/**
@@ -740,22 +740,19 @@ struct RegStateResult { 


        EutranRegistrationInfo eutranInfo;



        struct NgranRegistrationInfo {

        /**

         * Network capabilities for voice over PS services. This info is valid only on NR

         * network and must be present when the device is camped on NR. VopsInfo must be

         * empty when the device is not camped on NR.

         */

            NrVopsInfo nrVopsInfo;

        } ngranInfo;

        NrVopsInfo ngranNrVopsInfo;



        struct GeranRegistrationInfo {

        /**

         * True if the dual transfer mode is supported.

         * Refer to 3GPP TS 44.108 section 3.4.25.3

         */

            bool dtmSupported;

        } geranInfo;

        bool geranDtmSupported;



    } accessTechnologySpecificInfo;

};
@@ -874,10 +871,10 @@ struct PhysicalChannelConfig { 
    int32_t uplinkChannelNumber;



    /** Downlink cell bandwidth, in kHz */

    int32_t cellBandwidthDownlink;

    int32_t cellBandwidthDownlinkKhz;



    /** Uplink cell bandwidth, in kHz */

    int32_t cellBandwidthUplink;

    int32_t cellBandwidthUplinkKhz;



    /**

     * A list of data calls mapped to this physical channel. The context id must match the cid of
@@ -1059,7 +1056,7 @@ safe_union OptionalSscMode { 
    SscMode value;

};



enum SliceStatus : int32_t {

enum SliceStatus : int8_t {

    UNKNOWN,

    CONFIGURED, // Configured but not allowed or rejected yet

    ALLOWED,    // Allowed to be used
@@ -1072,7 +1069,7 @@ enum SliceStatus : int32_t { 
 * Enum representing session and service continuity mode as defined in

 * 3GPP TS 23.501.

 */

enum SscMode : int32_t {

enum SscMode : int8_t {

    MODE_1 = 1,

    MODE_2 = 2,

    MODE_3 = 3,
@@ -1081,7 +1078,7 @@ enum SscMode : int32_t { 
/**

 * Public key type from carrier certificate.

 */

enum PublicKeyType : int32_t {

enum PublicKeyType : int8_t {

    EPDG    = 1,                   // Key type to be used for ePDG

    WLAN    = 2,                   // Key type to be used for WLAN

};
@@ -1190,7 +1187,7 @@ struct PhonebookCapacity { 
 *   chunk of phonebook data, means this is a last indication with the left

 *   data.

 */

enum PbReceivedStatus : int32_t {

enum PbReceivedStatus : int8_t {

    PB_RECEIVED_OK = 1,

    PB_RECEIVED_ERROR = 2,

    PB_RECEIVED_ABORT = 3,

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+4 −4
Original line number Diff line number Diff line
@@ -213,10 +213,10 @@ TEST_P(RadioHidlTest_v1_6, sendSms_1_6) { 
}



/*

 * Test IRadio_1_6.sendSMSExpectMore() for the response returned.

 * Test IRadio_1_6.sendSmsExpectMore() for the response returned.

 */

TEST_P(RadioHidlTest_v1_6, sendSMSExpectMore_1_6) {

    LOG(DEBUG) << "sendSMSExpectMore";

TEST_P(RadioHidlTest_v1_6, sendSmsExpectMore_1_6) {

    LOG(DEBUG) << "sendSmsExpectMore";

    serial = GetRandomSerialNumber();

    GsmSmsMessage msg;

    msg.smscPdu = "";
@@ -236,7 +236,7 @@ TEST_P(RadioHidlTest_v1_6, sendSMSExpectMore_1_6) { 
             ::android::hardware::radio::V1_6::RadioError::SIM_ABSENT},

            CHECK_GENERAL_ERROR));

    }

    LOG(DEBUG) << "sendSMSExpectMore finished";

    LOG(DEBUG) << "sendSmsExpectMore finished";

}



/*

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon 
            const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

            const SendSmsResult& sms);



    Return<void> sendSMSExpectMoreResponse_1_6(

    Return<void> sendSmsExpectMoreResponse_1_6(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

            const SendSmsResult& sms);