diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-04 17:42:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-04 17:42:39 +0000 |
commit | f107b4231e883e51e45c92c22ec95cad5b7233eb (patch) | |
tree | 1236300c4d2a905ab7050bb9f0bf94e4b7995aa6 | |
parent | 1eb640d4409fd65696ac0622c198f64e241f2476 (diff) | |
parent | f90eddff522aec6d3de4a21d677322cce8300eb4 (diff) | |
download | platform_hardware_interfaces-f107b4231e883e51e45c92c22ec95cad5b7233eb.tar.gz platform_hardware_interfaces-f107b4231e883e51e45c92c22ec95cad5b7233eb.tar.bz2 platform_hardware_interfaces-f107b4231e883e51e45c92c22ec95cad5b7233eb.zip |
Merge "Cleanup IRadio/IRadioConfig HAL"
-rw-r--r-- | current.txt | 8 | ||||
-rw-r--r-- | radio/1.5/IRadio.hal | 20 | ||||
-rw-r--r-- | radio/1.5/IRadioResponse.hal | 5 | ||||
-rw-r--r-- | radio/1.5/types.hal | 42 | ||||
-rw-r--r-- | radio/1.5/vts/functional/radio_hidl_hal_api.cpp | 5 | ||||
-rw-r--r-- | radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h | 7 | ||||
-rw-r--r-- | radio/1.5/vts/functional/radio_response.cpp | 14 | ||||
-rw-r--r-- | radio/config/1.3/types.hal | 18 |
8 files changed, 58 insertions, 61 deletions
diff --git a/current.txt b/current.txt index fa2776538e..b58e466f66 100644 --- a/current.txt +++ b/current.txt @@ -637,11 +637,11 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork 9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types -50e22cd55ad5499e68e81541bbc67bd10e59c1b9f3ff8cc7ba70dcb0d2918381 android.hardware.radio@1.5::types -8cc3306e8cd755d04521d1611b217b9d13a2a76d2af57cbea8f875333b3363f7 android.hardware.radio@1.5::IRadio +88fb40d98b89cfaafad33b06c95e5dcd51c4470962e8fbe80ed22884407f98a1 android.hardware.radio@1.5::types +8062d0a1a03594dd8b448adcf6f08856b5720f7e33f9b785a21d3ef74a4f211d android.hardware.radio@1.5::IRadio e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication -7b77721a7716e163f5cc5f2830ed5616b953fcf0e5406f69de0fde5ce95e4184 android.hardware.radio@1.5::IRadioResponse -2fd107f3de1b7e36825e241a88dfae8edf3a77c166cb746f00ddf6440ab78db1 android.hardware.radio.config@1.3::types +7f2439b48bda2961c6d629d0415eee66d519142cf9537f05e9d285153c70ca85 android.hardware.radio@1.5::IRadioResponse +dcc8872337f0135e81970e1d8d5fd7139160dc80e9be76f0ae05290fa7e472b8 android.hardware.radio.config@1.3::types a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig 742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication 0006ab8e8b0910cbd3bbb08d5f17d5fac7d65a2bdad5f2334e4851db9d1e6fa8 android.hardware.radio.config@1.3::IRadioConfigResponse
\ No newline at end of file diff --git a/radio/1.5/IRadio.hal b/radio/1.5/IRadio.hal index bc405008a0..2ec92e54d1 100644 --- a/radio/1.5/IRadio.hal +++ b/radio/1.5/IRadio.hal @@ -18,10 +18,8 @@ package android.hardware.radio@1.5; import @1.0::CdmaSmsMessage; import @1.2::DataRequestReason; -import @1.4::DataProfileInfo; import @1.4::IRadio; import @1.5::AccessNetwork; -import @1.5::BarringInfo; import @1.5::DataProfileInfo; import @1.5::IndicationFilter; import @1.5::LinkAddress; @@ -118,13 +116,13 @@ interface IRadio extends @1.4::IRadio { vec<RadioAccessSpecifier> specifiers); /** - * Starts a network scan + * Starts a network scan. * * @param serial Serial number of request. * @param request Defines the radio networks/bands/channels which need to be scanned. * - * Same API as @1.4::IRadio.startNetworkScan_1_4, except using - * 1.5 version of NetworkScanRequest + * Same API as @1.4::IRadio.startNetworkScan_1_4, except using the + * 1.5 NetworkScanRequest as the input param. */ oneway startNetworkScan_1_5(int32_t serial, NetworkScanRequest request); @@ -166,14 +164,14 @@ interface IRadio extends @1.4::IRadio { * Response function is IRadioResponse.setupDataCallResponse_1_5() * * Note this API is the same as the 1.4 version except using the - * 1.5 AccessNetwork, DataProfileInto, and link addresses as the input param. + * 1.5 AccessNetwork, DataProfileInto, and LinkAddress as the input param. */ oneway setupDataCall_1_5(int32_t serial, AccessNetwork accessNetwork, DataProfileInfo dataProfileInfo, bool roamingAllowed, DataRequestReason reason, vec<LinkAddress> addresses, vec<string> dnses); /** - * Set an apn to initial attach network + * Set an APN to initial attach network. * * @param serial Serial number of request. * @param dataProfileInfo data profile containing APN settings @@ -189,7 +187,7 @@ interface IRadio extends @1.4::IRadio { * Send data profiles of the current carrier to the modem. * * @param serial Serial number of request. - * @param profiles Array of DataProfile to set. + * @param profiles Array of DataProfileInfo to set. * * Response callback is IRadioResponse.setDataProfileResponse_1_5() * @@ -230,7 +228,7 @@ interface IRadio extends @1.4::IRadio { * * Prevents the reporting of specified unsolicited indications from the radio. This is used * for power saving in instances when those indications are not needed. If unset, defaults to - * @1.2::IndicationFilter:ALL. + * @1.5::IndicationFilter:ALL. * * @param serial Serial number of request. * @param indicationFilter 32-bit bitmap of IndicationFilter. Bits set to 1 indicate the @@ -250,7 +248,7 @@ interface IRadio extends @1.4::IRadio { oneway getBarringInfo(int32_t serial); /** - * Request current voice registration state + * Request current voice registration state. * * @param serial Serial number of request. * @@ -259,7 +257,7 @@ interface IRadio extends @1.4::IRadio { oneway getVoiceRegistrationState_1_5(int32_t serial); /** - * Request current data registration state + * Request current data registration state. * * @param serial Serial number of request. * diff --git a/radio/1.5/IRadioResponse.hal b/radio/1.5/IRadioResponse.hal index 6a2187f69d..aa8b526ffa 100644 --- a/radio/1.5/IRadioResponse.hal +++ b/radio/1.5/IRadioResponse.hal @@ -21,10 +21,9 @@ import @1.0::SendSmsResult; import @1.4::IRadioResponse; import @1.5::BarringInfo; import @1.5::CellInfo; +import @1.5::PersoSubstate; import @1.5::RegStateResult; import @1.5::SetupDataCallResult; -import @1.4::SetupDataCallResult; -import @1.5::PersoSubstate; /** * Interface declaring response functions to solicited radio requests. @@ -177,6 +176,7 @@ interface IRadioResponse extends @1.4::IRadioResponse { oneway getBarringInfoResponse(RadioResponseInfo info, vec<BarringInfo> barringInfos); /** + * @param info Response info struct containing response type, serial no. and error * @param voiceRegResponse Current Voice registration response as defined by RegStateResult * in types.hal * @@ -215,7 +215,6 @@ interface IRadioResponse extends @1.4::IRadioResponse { */ oneway getCellInfoListResponse_1_5(RadioResponseInfo info, vec<CellInfo> cellInfo); - /** * @param info Response info struct containing response type, serial no. and error * diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal index cf195ccb0a..a0868337dd 100644 --- a/radio/1.5/types.hal +++ b/radio/1.5/types.hal @@ -19,19 +19,15 @@ package android.hardware.radio@1.5; import @1.0::ApnAuthType; import @1.0::DataProfileId; import @1.0::DataProfileInfoType; -import @1.0::CdmaSignalStrength; -import @1.0::EvdoSignalStrength; import @1.0::GsmSignalStrength; import @1.0::LteSignalStrength; import @1.0::PersoSubstate; -import @1.0::RadioAccessFamily; import @1.0::RadioError; import @1.0::RegState; import @1.0::TimeStampType; import @1.1::EutranBands; import @1.1::GeranBands; import @1.1::RadioAccessNetworks; -import @1.1::RadioAccessSpecifier; import @1.1::ScanStatus; import @1.1::ScanType; import @1.1::UtranBands; @@ -43,7 +39,6 @@ import @1.2::CellIdentityTdscdma; import @1.2::CellIdentityLte; import @1.2::CellInfoCdma; import @1.2::IndicationFilter; -import @1.2::NetworkScanRequest; import @1.2::TdscdmaSignalStrength; import @1.2::WcdmaSignalStrength; import @1.4::AccessNetwork; @@ -51,11 +46,11 @@ import @1.4::ApnTypes; import @1.4::CellIdentityNr; import @1.4::DataCallFailCause; import @1.4::DataConnActiveStatus; -import @1.4::DataProfileInfo; import @1.4::LteVopsInfo; import @1.4::NrIndicators; import @1.4::NrSignalStrength; import @1.4::PdpProtocolType; +import @1.4::RadioAccessFamily; import @1.4::RadioTechnology; import android.hidl.safe_union@1.0::Monostate; @@ -131,7 +126,7 @@ struct SignalThresholdInfo { /** Signal Measurement Type */ SignalMeasurementType signalMeasurement; - /** A hysteresis time in milliseconds to prevent flapping. A value of 0 disables hysteresis */ + /** A hysteresis time in milliseconds to prevent flapping. A value of 0 disables hysteresis. */ int32_t hysteresisMs; /** @@ -175,7 +170,7 @@ enum RadioAccessNetworks : @1.1::RadioAccessNetworks { }; /** - * Overwritten from @1.1::RadioAccessSpecifier to add NGRAN and NgranBands + * Overwritten from @1.1::RadioAccessSpecifier to add NGRAN and NgranBands. */ struct RadioAccessSpecifier { /** @@ -264,8 +259,7 @@ enum UtranBands : @1.1::UtranBands { }; /** - * Overwritten from @1.2::NetworkScanRequest to update - * RadioAccessSpecifier to 1.5 version + * Overwritten from @1.2::NetworkScanRequest to update RadioAccessSpecifier to 1.5 version. */ struct NetworkScanRequest { ScanType type; @@ -328,11 +322,10 @@ enum ApnTypes : @1.4::ApnTypes { }; /** - * Extended from @1.4::DataProfileInfo to update ApnTypes to 1.5 version and replace mtu with + * Overwritten from @1.4::DataProfileInfo to update ApnTypes to 1.5 version and replace mtu with * mtuV4 and mtuV6. In the future, this must be extended instead of overwritten. */ struct DataProfileInfo { - /** ID of the data profile. */ DataProfileId profileId; @@ -445,8 +438,8 @@ struct LinkAddress { }; /** - * Overwritten from @1.4::SetupDataCallResult in order to update the addresses to 1.5 - * version. In 1.5 the type of addresses changes to vector of LinkAddress, and mtu is replaced by + * Overwritten from @1.4::SetupDataCallResult in order to update the addresses to 1.5 version. + * In 1.5 the type of addresses changes to vector of LinkAddress, and mtu is replaced by * mtuV4 and mtuV6. */ struct SetupDataCallResult { @@ -687,7 +680,7 @@ struct CellInfo { } ratSpecificInfo; }; -/** A union representing the CellIdentity of a single cell */ +/** A union representing the CellIdentity of a single cell. */ safe_union CellIdentity { Monostate noinit; @@ -708,7 +701,7 @@ safe_union CellIdentity { * -NGRAN - 3gpp 38.331 Sec 6.3.2 UAC-BarringInfo and 22.261 Sec 6.22.2.[2-3] */ enum BarringServiceType : int32_t { - /** Applicabe to UTRAN */ + /** Applicable to UTRAN */ /** Barring for all CS services, including registration */ CS_SERVICE, /** Barring for all PS services, including registration */ @@ -963,14 +956,14 @@ struct RegStateResult { string registeredPlmn; /** - * Access-technology-specific registration information, such as for Cdma2000. + * Access-technology-specific registration information, such as for CDMA2000. */ safe_union AccessTechnologySpecificInfo { Monostate noinit; struct Cdma2000RegistrationInfo { /** - * concurrent services support indicator. if registered on a CDMA system. + * Concurrent services support indicator. if registered on a CDMA system. * false - Concurrent services not supported, * true - Concurrent services supported */ @@ -999,10 +992,10 @@ struct RegStateResult { struct EutranRegistrationInfo { /** * Network capabilities for voice over PS services. This info is valid only on LTE - * network and must be present when device is camped on LTE. vopsInfo must be empty when + * network and must be present when device is camped on LTE. VopsInfo must be empty when * device is camped only on 2G/3G. */ - LteVopsInfo lteVopsInfo; // LTE network capability + LteVopsInfo lteVopsInfo; /** * The parameters of NR 5G Non-Standalone. This value is only valid on E-UTRAN, @@ -1032,17 +1025,20 @@ struct NetworkScanResult { }; /** - * Additional personalization categories in addition to those specified in 3GPP TS 22.022 and 3GPP2 C.S0068-0. + * Additional personalization categories in addition to those specified in 3GPP TS 22.022 and + * 3GPP2 C.S0068-0. */ enum PersoSubstate : @1.0::PersoSubstate { SIM_SPN, SIM_SPN_PUK, - SIM_SP_EHPLMN, // Equivalent Home PLMN + /** Equivalent Home PLMN */ + SIM_SP_EHPLMN, SIM_SP_EHPLMN_PUK, SIM_ICCID, SIM_ICCID_PUK, SIM_IMPI, SIM_IMPI_PUK, - SIM_NS_SP, // Network subset service provider + /** Network subset service provider */ + SIM_NS_SP, SIM_NS_SP_PUK, }; diff --git a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp index 39133179e1..40ae75a1dd 100644 --- a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp @@ -969,7 +969,10 @@ TEST_F(RadioHidlTest_v1_5, setDataProfile_1_5) { } } -TEST_F(RadioHidlTest_v1_5, setRadioPower_1_5_emergencyCall_cancalled) { +/* + * Test IRadio.setRadioPower_1_5() for the response returned. + */ +TEST_F(RadioHidlTest_v1_5, setRadioPower_1_5_emergencyCall_cancelled) { // Set radio power to off. serial = GetRandomSerialNumber(); radio_v1_5->setRadioPower_1_5(serial, false, false, false); diff --git a/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h b/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h index d1c17e6fab..ce7b1ab8e7 100644 --- a/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h +++ b/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h @@ -114,9 +114,6 @@ class RadioResponse_v1_5 : public ::android::hardware::radio::V1_5::IRadioRespon Return<void> supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info, int32_t remainingRetries); - Return<void> supplySimDepersonalizationResponse(const RadioResponseInfo& info, - ::android::hardware::radio::V1_5::PersoSubstate persoType, int32_t remainingRetries); - Return<void> getCurrentCallsResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& calls); @@ -579,6 +576,10 @@ class RadioResponse_v1_5 : public ::android::hardware::radio::V1_5::IRadioRespon Return<void> sendCdmaSmsExpectMoreResponse(const RadioResponseInfo& info, const SendSmsResult& sms); + + Return<void> supplySimDepersonalizationResponse( + const RadioResponseInfo& info, + ::android::hardware::radio::V1_5::PersoSubstate persoType, int32_t remainingRetries); }; /* Callback class for radio indication */ diff --git a/radio/1.5/vts/functional/radio_response.cpp b/radio/1.5/vts/functional/radio_response.cpp index a62d086d80..26401eb800 100644 --- a/radio/1.5/vts/functional/radio_response.cpp +++ b/radio/1.5/vts/functional/radio_response.cpp @@ -62,13 +62,6 @@ Return<void> RadioResponse_v1_5::supplyNetworkDepersonalizationResponse( return Void(); } -Return<void> RadioResponse_v1_5::supplySimDepersonalizationResponse( - const RadioResponseInfo& /*info*/, - ::android::hardware::radio::V1_5::PersoSubstate /*persoType*/, - int32_t /*remainingRetries*/) { - return Void(); -} - Return<void> RadioResponse_v1_5::getCurrentCallsResponse( const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& /*calls*/) { @@ -1011,3 +1004,10 @@ Return<void> RadioResponse_v1_5::sendCdmaSmsExpectMoreResponse(const RadioRespon const SendSmsResult& /*sms*/) { return Void(); } + +Return<void> RadioResponse_v1_5::supplySimDepersonalizationResponse( + const RadioResponseInfo& /*info*/, + ::android::hardware::radio::V1_5::PersoSubstate /*persoType*/, + int32_t /*remainingRetries*/) { + return Void(); +} diff --git a/radio/config/1.3/types.hal b/radio/config/1.3/types.hal index 7860006707..aef0ff8a21 100644 --- a/radio/config/1.3/types.hal +++ b/radio/config/1.3/types.hal @@ -50,17 +50,17 @@ enum ModemFeatures : int32_t { /** 3GPP capability. */ THREE_GPP_REG = 1 << 1, /** CDMA 2000 with EHRPD capability. */ - CDMA2000_EHRPD_REG = 1 << 2, - /** GSM capability. */ - GERAN_REG = 1 << 3, + CDMA2000_EHRPD = 1 << 2, + /** GSM/EDGE capability. */ + GERAN = 1 << 3, /** UMTS capability. */ - UTRAN_REG = 1 << 4, + UTRAN = 1 << 4, /** LTE capability. */ - EUTRAN_REG = 1 << 5, + EUTRAN = 1 << 5, /** 5G capability. */ - NGRAN_REG = 1 << 6, - /** Dual Connectivity capability. */ - EN_DC_REG = 1 << 7, + NGRAN = 1 << 6, + /** 5G dual connectivity capability. */ + EN_DC = 1 << 7, /** VoLTE capability (IMS registered). */ PS_VOICE_REG = 1 << 8, /** CS voice call capability. */ @@ -72,7 +72,7 @@ enum ModemFeatures : int32_t { /** Network scanning capability. */ NETWORK_SCAN = 1 << 12, /** CDMA capability for SIM associated with modem. */ - CSIM = 1 << 13, + CSIM_APP = 1 << 13, }; struct ConcurrentModemFeatures { |