tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "PhoneCapabilities changes for device capabilities"

Browse source
This commit is contained in:
Sarah Chin 2020-01-22 04:20:43 +00:00 committed by Android (Google) Code Review
commit f33c0b5561
18 changed files with 315 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
current.txt
View file

@ -670,10 +670,10 @@ def77c7db95d374f11a111bfc4ed60f92451303642a43276c4e291988fcee625 android.hardwar
996f98ffe508a2f6f1755c1511b50067f7883f7c445dea9f3e931385f020b7ab android.hardware.radio@1.5::IRadio
20d52e66fd548f89bcb98cda42749a591ce8f439a2a7148617adac0c967ad937 android.hardware.radio@1.5::IRadioIndication
1512f6e1198e1aa0ebcbdb1694d0ed500a3e7791d6f305327866112331d82b66 android.hardware.radio@1.5::IRadioResponse
55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types
b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig
5971a891d7d8843e9fb9f44583a9a0a265ec42fd5e4e1c95c9803454d21fabf7 android.hardware.radio.config@1.3::types
a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig
742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication
7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse
0006ab8e8b0910cbd3bbb08d5f17d5fac7d65a2bdad5f2334e4851db9d1e6fa8 android.hardware.radio.config@1.3::IRadioConfigResponse
##
# END Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present
##

1
radio/1.5/vts/functional/Android.bp
View file

@ -34,6 +34,7 @@ cc_test {
"android.hardware.radio@1.0",
"android.hardware.radio.config@1.0",
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.3",
],
header_libs: ["radio.util.header@1.0"],
test_suites: ["general-tests"]

4
radio/1.5/vts/functional/radio_hidl_hal_test.cpp
View file

@ -47,9 +47,9 @@ void RadioHidlTest_v1_5::SetUp() {
EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
sp<::android::hardware::radio::config::V1_1::IRadioConfig> radioConfig =
sp<::android::hardware::radio::config::V1_3::IRadioConfig> radioConfig =
::testing::VtsHalHidlTargetTestBase::getService<
::android::hardware::radio::config::V1_1::IRadioConfig>();
::android::hardware::radio::config::V1_3::IRadioConfig>();
/* Enforce Vts tesing with RadioConfig is existed. */
ASSERT_NE(nullptr, radioConfig.get());

2
radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h
View file

@ -22,7 +22,7 @@
#include <condition_variable>
#include <mutex>
#include <android/hardware/radio/config/1.1/IRadioConfig.h>
#include <android/hardware/radio/config/1.3/IRadioConfig.h>
#include <android/hardware/radio/1.5/IRadio.h>
#include <android/hardware/radio/1.5/IRadioIndication.h>

3
radio/config/1.3/Android.bp
View file

@ -17,6 +17,9 @@ hidl_interface {
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.4",
"android.hardware.radio@1.5",
"android.hidl.base@1.0",
],
gen_java: true,

10
radio/config/1.3/IRadioConfig.hal
View file

@ -27,5 +27,13 @@ import @1.1::IRadioConfig;
* serial to different methods), multiple responses (one for each method call) must still be served.
*/
interface IRadioConfig extends @1.1::IRadioConfig {
/**
* Request current phone capability.
*
* @param serial Serial number of request.
*
* Response callback is IRadioResponse.getPhoneCapabilityResponse_1_3() which
* will return <@1.3::PhoneCapability>.
*/
oneway getPhoneCapability_1_3(int32_t serial);
};

13
radio/config/1.3/IRadioConfigResponse.hal
View file

@ -16,11 +16,22 @@
package android.hardware.radio.config@1.3;
import android.hardware.radio@1.0::RadioResponseInfo;
import @1.2::IRadioConfigResponse;
import @1.3::PhoneCapability;
/**
* Interface declaring response functions to solicited radio config requests.
*/
interface IRadioConfigResponse extends @1.2::IRadioConfigResponse {
/**
* @param info Response info struct containing response type, serial no. and error
* @param phoneCapability <@1.3::PhoneCapability> it defines modem's capability for example
* how many logical modems it has, how many data connections it supports.
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
*/
oneway getPhoneCapabilityResponse_1_3(RadioResponseInfo info, PhoneCapability phoneCapability);
};

9
radio/config/1.3/default/RadioConfig.cpp
View file

@ -24,7 +24,6 @@ namespace V1_3 {
namespace implementation {
using namespace ::android::hardware::radio::V1_0;
using namespace ::android::hardware::radio::config;
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfig follow.
Return<void> RadioConfig::setResponseFunctions(
@ -105,6 +104,14 @@ Return<void> RadioConfig::getModemsConfig(int32_t /* serial */) {
return Void();
}
// Methods from ::android::hardware::radio::config::V1_3::IRadioConfig follow.
Return<void> RadioConfig::getPhoneCapability_1_3(int32_t /* serial */) {
V1_3::PhoneCapability phoneCapability;
RadioResponseInfo info;
mRadioConfigResponseV1_3->getPhoneCapabilityResponse_1_3(info, phoneCapability);
return Void();
}
} // namespace implementation
} // namespace V1_3
} // namespace config

3
radio/config/1.3/default/RadioConfig.h
View file

@ -62,6 +62,9 @@ struct RadioConfig : public V1_3::IRadioConfig {
Return<void> setPreferredDataModem(int32_t serial, uint8_t modemId);
Return<void> setModemsConfig(int32_t serial, const V1_1::ModemsConfig& modemsConfig);
Return<void> getModemsConfig(int32_t serial);
// Methods from ::android::hardware::radio::config::V1_3::IRadioConfig follow.
Return<void> getPhoneCapability_1_3(int32_t serial);
};
} // namespace implementation

4
radio/config/1.3/default/RadioConfigIndication.cpp
View file

@ -23,10 +23,6 @@ namespace config {
namespace V1_3 {
namespace implementation {
using namespace ::android::hardware::radio::V1_0;
using namespace ::android::hardware::radio::config::V1_0;
using namespace ::android::hardware::radio::config::V1_2;
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfigIndication follow.
Return<void> RadioConfigIndication::simSlotsStatusChanged(
RadioIndicationType /* type */, const hidl_vec<V1_0::SimSlotStatus>& /* slotStatus */) {

4
radio/config/1.3/default/RadioConfigIndication.h
View file

@ -31,10 +31,6 @@ namespace implementation {
using namespace ::android::hardware::radio::V1_0;
using namespace ::android::hardware::radio::config;
using ::android::sp;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;

12
radio/config/1.3/default/RadioConfigResponse.cpp
View file

@ -23,11 +23,6 @@ namespace config {
namespace V1_3 {
namespace implementation {
using namespace ::android::hardware::radio::V1_0;
using namespace ::android::hardware::radio::config::V1_0;
using namespace ::android::hardware::radio::config::V1_1;
using namespace ::android::hardware::radio::config::V1_2;
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfigResponse follow.
Return<void> RadioConfigResponse::getSimSlotsStatusResponse(
const RadioResponseInfo& /* info */,
@ -73,6 +68,13 @@ Return<void> RadioConfigResponse::getSimSlotsStatusResponse_1_2(
return Void();
}
// Methods from ::android::hardware::radio::config::V1_3::IRadioConfigResponse follow.
Return<void> RadioConfigResponse::getPhoneCapabilityResponse_1_3(
const RadioResponseInfo& /* info */, const V1_3::PhoneCapability& /* phoneCapability */) {
// TODO implement
return Void();
}
} // namespace implementation
} // namespace V1_3
} // namespace config

43
radio/config/1.3/default/RadioConfigResponse.h
View file

@ -28,43 +28,36 @@ namespace config {
namespace V1_3 {
namespace implementation {
using ::android::sp;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory;
using ::android::hardware::hidl_string;
using namespace ::android::hardware::radio::config;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::hardware::radio::V1_0::RadioResponseInfo;
struct RadioConfigResponse : public IRadioConfigResponse {
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfigResponse follow.
Return<void> getSimSlotsStatusResponse(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info,
const hidl_vec<::android::hardware::radio::config::V1_0::SimSlotStatus>& slotStatus)
override;
Return<void> setSimSlotsMappingResponse(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info) override;
const RadioResponseInfo& info,
const hidl_vec<V1_0::SimSlotStatus>& slotStatus) override;
Return<void> setSimSlotsMappingResponse(const RadioResponseInfo& info) override;
// Methods from ::android::hardware::radio::config::V1_1::IRadioConfigResponse follow.
Return<void> getPhoneCapabilityResponse(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info,
const ::android::hardware::radio::config::V1_1::PhoneCapability& phoneCapability)
override;
Return<void> setPreferredDataModemResponse(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info) override;
Return<void> setModemsConfigResponse(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info) override;
Return<void> getModemsConfigResponse(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info,
const ::android::hardware::radio::config::V1_1::ModemsConfig& modemsConfig) override;
Return<void> getPhoneCapabilityResponse(const RadioResponseInfo& info,
const V1_1::PhoneCapability& phoneCapability) override;
Return<void> setPreferredDataModemResponse(const RadioResponseInfo& info) override;
Return<void> setModemsConfigResponse(const RadioResponseInfo& info) override;
Return<void> getModemsConfigResponse(const RadioResponseInfo& info,
const V1_1::ModemsConfig& modemsConfig) override;
// Methods from ::android::hardware::radio::config::V1_2::IRadioConfigResponse follow.
Return<void> getSimSlotsStatusResponse_1_2(
const ::android::hardware::radio::V1_0::RadioResponseInfo& info,
const hidl_vec<::android::hardware::radio::config::V1_2::SimSlotStatus>& slotStatus)
override;
const RadioResponseInfo& info,
const hidl_vec<V1_2::SimSlotStatus>& slotStatus) override;
// Methods from ::android::hidl::base::V1_0::IBase follow.
// Methods from ::android::hardware::radio::config::V1_3::IRadioConfigResponse follow.
Return<void> getPhoneCapabilityResponse_1_3(
const RadioResponseInfo& info, const V1_3::PhoneCapability& phoneCapability) override;
};
} // namespace implementation

178
radio/config/1.3/types.hal
View file

@ -15,3 +15,181 @@
*/
package android.hardware.radio.config@1.3;
import android.hardware.radio@1.1::GeranBands;
import android.hardware.radio@1.1::UtranBands;
import android.hardware.radio@1.1::EutranBands;
import android.hardware.radio@1.4::RadioAccessFamily;
import android.hardware.radio@1.5::NgranBands;
/** Type for the SIM slot. */
enum SlotType : int32_t {
/** Slot type for UICC/pSIM (physical SIM). */
UICC = 1,
/** Slot type for iUICC/iSIM (integrated SIM). */
IUICC = 2,
/** Slot type for eUICC/eSIM (embedded SIM). */
EUICC = 3,
/** Slot type for soft SIM (no physical SIM). */
SOFT_SIM = 4,
};
/** A field in PhoneCapability that holds information about the SIM slot. */
struct SimSlotCapability {
/** Corresponds to physicalSlotId in Radio@1.2::CardStatus. */
uint32_t physicalSlotId;
/** Type of slot. */
SlotType slotType;
};
/** Bitmask of features that can be supported by a single modem. */
enum ModemFeatures : int32_t {
/** 3GPP2 capability. */
THREE_GPP2_REG = 1 << 0,
/** 3GPP capability. */
THREE_GPP_REG = 1 << 1,
/** CDMA 2000 with EHRPD capability. */
CDMA2000_EHRPD_REG = 1 << 2,
/** GSM capability. */
GERAN_REG = 1 << 3,
/** UMTS capability. */
UTRAN_REG = 1 << 4,
/** LTE capability. */
EUTRAN_REG = 1 << 5,
/** 5G capability. */
NGRAN_REG = 1 << 6,
/** Dual Connectivity capability. */
EN_DC_REG = 1 << 7,
/** VoLTE capability (IMS registered). */
PS_VOICE_REG = 1 << 8,
/** CS voice call capability. */
CS_VOICE_SESSION = 1 << 9,
/** Internet connection capability. */
INTERACTIVE_DATA_SESSION = 1 << 10,
/** Dedicated bearer capability. */
DEDICATED_BEARER = 1 << 11,
/** Network scanning capability. */
NETWORK_SCAN = 1 << 12,
/** CDMA capability for SIM associated with modem. */
CSIM = 1 << 13,
};
struct ConcurrentModemFeatures {
/**
* A vector of concurrently supportable modem features across all modems.
* Each entry in the vector is a bitfield of ModemFeatures that can be used
* concurrently with the other ModemFeatures in that list.
* Each bitfield must be the full set of features for a single modem.
*
* On a Dual-SIM device, each entry will be a vector of length 2.
* The examples below depict the modemFeatures for four Dual-SIM setups:
* 1. Only one modem can PS attach (IMS registered).
* {
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* CS_VOICE_SESSION | INTERACTIVE_DATA_SESSION | DEDICATED_BEARER),
* (GERAN_REG | UTRAN_REG)
* }
* or
* {
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* INTERACTIVE_DATA_SESSION),
* (GERAN_REG | UTRAN_REG | CS_VOICE_SESSION)
* }
* 2. Both modems can PS attach (dual VoLTE).
* {
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* CS_VOICE_SESSION | INTERACTIVE_DATA_SESSION | DEDICATED_BEARER),
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG)
* }
* 3. Both modems can maintain an Internet connection, but they share
* one RF hardware.
* {
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* CS_VOICE_SESSION | INTERACTIVE_DATA_SESSION | DEDICATED_BEARER),
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* INTERACTIVE_DATA_SESSION)
* }
* 4. Both modems can maintain an Internet connection, and they have
* their own RF hardware.
* {
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* CS_VOICE_SESSION | INTERACTIVE_DATA_SESSION | DEDICATED_BEARER),
* (GERAN_REG | UTRAN_REG | EUTRAN_REG | PS_VOICE_REG |
* INTERACTIVE_DATA_SESSION | DEDICATED_BEARER)
* }
*/
vec<bitfield<ModemFeatures>> modemFeatures;
};
/**
* Overwritten from @1.1::PhoneCapability to add new capabilities and deprecate
* maxActiveData, maxActiveInternetData, isInternetLingeringSupported, logicalModemList.
* Replaces RadioConfig@1.1::ModemInfo and should replace Radio@1.4::RadioCapabilities
* in the next major version upgrade. In the future, this should be extended instead of overwritten.
*/
struct PhoneCapability {
/**
* 3GPP UE category for UTRAN downlink direction.
* 25.306 Table 5.1a
*/
uint8_t utranUeCategoryDl;
/**
* 3GPP UE category for UTRAN uplink direction.
* 25.306 Table 5.1g
*/
uint8_t utranUeCategoryUl;
/**
* 3GPP UE category for EUTRAN downlink direction.
* 25.306 Table 4.1a
*/
uint8_t eutranUeCategoryDl;
/**
* 3GPP UE category for EUTRAN uplink direction.
* 25.306 Table 4.1a-2
*/
uint8_t eutranUeCategoryUl;
/**
* Length of grace period for switching between logical modems, in milliseconds.
* Used only when the number of logical modems is greater than the number of
* Internet connections the device can support, otherwise must be 0.
*/
uint64_t psDataConnectionLingerTimeMillis;
vec<GeranBands> geranBands;
vec<UtranBands> utranBands;
vec<EutranBands> eutranBands;
vec<NgranBands> ngranBands;
/**
* 32-bit bitmap of supported Radio@1.4::RadioAccessFamily types.
* Note that RadioAccessFamily is actually the radio access technologies, so it should be
* renamed in the next major version upgrade.
*/
bitfield<RadioAccessFamily> supportedRats;
/**
* List of unique logical modem UUIDs from Radio@1.4::RadioCapabilities.
* A UUID is typically "com.xxxx.lmX" where X is the logical modem ID.
* Must be equal to the number of logical modems in the device.
* Radio@1.2::RadioConst::MAX_UUID_LENGTH is the max length of each UUID.
*/
vec<string> logicalModemUuids;
/**
* List of SIM slot capabilities. The order of physical slot IDs must correspond to
* the order of modems in logicalModemUuids.
*/
vec<SimSlotCapability> simSlotCapabilities;
/**
* A vector of all sets of concurrently supportable modem feature sets. The order of modems
* in modemFeatures must correspond to the order of modems in logicalModemUuids.
* Each entry in concurrentFeatureSupport is independent of others in the list
* and represents a set of concurrently supportable features across all modems.
* Each entry in ConcurrentModemFeatures::modemFeatures is a bitfield of
* concurrently supported ModemFeatures for one modem.
*/
vec<ConcurrentModemFeatures> concurrentFeatureSupport;
};

31
radio/config/1.3/vts/functional/radio_config_hidl_hal_api.cpp
View file

@ -17,3 +17,34 @@
#include <radio_config_hidl_hal_utils.h>
#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
/*
* Test IRadioConfig.getPhoneCapability_1_3()
*/
TEST_P(RadioConfigHidlTest, getPhoneCapability_1_3) {
serial = GetRandomSerialNumber();
Return<void> res = radioConfig->getPhoneCapability_1_3(serial);
ASSERT_OK(res);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);
EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);
ALOGI("getPhoneCapability_1_3, rspInfo.error = %s\n",
toString(radioConfigRsp->rspInfo.error).c_str());
ASSERT_TRUE(CheckAnyOfErrors(
radioConfigRsp->rspInfo.error,
{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INTERNAL_ERR}));
if (radioConfigRsp->rspInfo.error == RadioError ::NONE) {
int numModems = radioConfigRsp->phoneCap_1_3.logicalModemUuids.size();
EXPECT_GE(numModems, 0);
// length of simSlotCapabilities should be equal to length of logicalModemUuids.
EXPECT_EQ(numModems, radioConfigRsp->phoneCap_1_3.simSlotCapabilities.size());
// length of modemFeatures in each ConcurrentModemFeatures should be
// equal to length of logicalModemUuids.
for (V1_3::ConcurrentModemFeatures cmf :
radioConfigRsp->phoneCap_1_3.concurrentFeatureSupport) {
EXPECT_EQ(numModems, cmf.modemFeatures.size());
}
}
}

2
radio/config/1.3/vts/functional/radio_config_hidl_hal_test.cpp
View file

@ -17,7 +17,7 @@
#include <radio_config_hidl_hal_utils.h>
void RadioConfigHidlTest::SetUp() {
radioConfig = ::android::hardware::radio::config::V1_3::IRadioConfig::getService(GetParam());
radioConfig = V1_3::IRadioConfig::getService(GetParam());
ASSERT_NE(nullptr, radioConfig.get());
radioConfigRsp = new (std::nothrow) RadioConfigResponse(*this);

37
radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h
View file

@ -28,19 +28,18 @@
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
#include <log/log.h>
#include "vts_test_util.h"
using namespace ::android::hardware::radio::config::V1_1;
using namespace ::android::hardware::radio::config::V1_2;
using namespace ::android::hardware::radio::config::V1_3;
using namespace ::android::hardware::radio::config;
using ::android::sp;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::hardware::radio::V1_0::RadioIndicationType;
using ::android::hardware::radio::V1_0::RadioResponseInfo;
using ::android::hardware::radio::V1_0::RadioResponseType;
@ -49,43 +48,46 @@ using ::android::hardware::radio::V1_0::RadioResponseType;
class RadioConfigHidlTest;
/* Callback class for radio config response */
class RadioConfigResponse : public ::android::hardware::radio::config::V1_3::IRadioConfigResponse {
class RadioConfigResponse : public V1_3::IRadioConfigResponse {
protected:
RadioConfigHidlTest& parent;
public:
RadioResponseInfo rspInfo;
PhoneCapability phoneCap;
V1_1::PhoneCapability phoneCap_1_1;
V1_3::PhoneCapability phoneCap_1_3;
RadioConfigResponse(RadioConfigHidlTest& parent);
virtual ~RadioConfigResponse() = default;
/* 1.0 Api */
Return<void> getSimSlotsStatusResponse(
const RadioResponseInfo& info,
const hidl_vec<::android::hardware::radio::config::V1_0::SimSlotStatus>& slotStatus);
Return<void> getSimSlotsStatusResponse(const RadioResponseInfo& info,
const hidl_vec<V1_0::SimSlotStatus>& slotStatus);
Return<void> setSimSlotsMappingResponse(const RadioResponseInfo& info);
/* 1.1 Api */
Return<void> getPhoneCapabilityResponse(const RadioResponseInfo& info,
const PhoneCapability& phoneCapability);
const V1_1::PhoneCapability& phoneCapability);
Return<void> setPreferredDataModemResponse(const RadioResponseInfo& info);
Return<void> getModemsConfigResponse(const RadioResponseInfo& info,
const ModemsConfig& mConfig);
const V1_1::ModemsConfig& mConfig);
Return<void> setModemsConfigResponse(const RadioResponseInfo& info);
/* 1.2 Api */
Return<void> getSimSlotsStatusResponse_1_2(const RadioResponseInfo& info,
const hidl_vec<SimSlotStatus>& slotStatus);
const hidl_vec<V1_2::SimSlotStatus>& slotStatus);
/* 1.3 Api */
Return<void> getPhoneCapabilityResponse_1_3(const RadioResponseInfo& info,
const V1_3::PhoneCapability& phoneCapability);
};
/* Callback class for radio config indication */
class RadioConfigIndication
: public ::android::hardware::radio::config::V1_3::IRadioConfigIndication {
class RadioConfigIndication : public V1_3::IRadioConfigIndication {
protected:
RadioConfigHidlTest& parent;
@ -94,9 +96,8 @@ class RadioConfigIndication
virtual ~RadioConfigIndication() = default;
/* 1.2 Api */
Return<void> simSlotsStatusChanged_1_2(
::android::hardware::radio::V1_0::RadioIndicationType type,
const hidl_vec<SimSlotStatus>& slotStatus);
Return<void> simSlotsStatusChanged_1_2(RadioIndicationType type,
const hidl_vec<V1_2::SimSlotStatus>& slotStatus);
};
// The main test class for Radio config HIDL.
@ -121,7 +122,7 @@ class RadioConfigHidlTest : public ::testing::TestWithParam<std::string> {
int serial;
/* radio config service handle */
sp<::android::hardware::radio::config::V1_3::IRadioConfig> radioConfig;
sp<V1_3::IRadioConfig> radioConfig;
/* radio config response handle */
sp<RadioConfigResponse> radioConfigRsp;

28
radio/config/1.3/vts/functional/radio_config_response.cpp
View file

@ -16,17 +16,18 @@
#include <radio_config_hidl_hal_utils.h>
using ::android::hardware::radio::V1_0::RadioResponseInfo;
using namespace ::android::hardware::radio::config;
// SimSlotStatus slotStatus;
using ::android::hardware::hidl_vec;
using ::android::hardware::radio::V1_0::RadioResponseInfo;
RadioConfigResponse::RadioConfigResponse(RadioConfigHidlTest& parent) : parent(parent) {}
/* 1.0 Apis */
Return<void> RadioConfigResponse::getSimSlotsStatusResponse(
const RadioResponseInfo& /* info */,
const ::android::hardware::hidl_vec<
::android::hardware::radio::config::V1_0::SimSlotStatus>& /* slotStatus */) {
const hidl_vec<V1_0::SimSlotStatus>& /* slotStatus */) {
return Void();
}
@ -36,9 +37,9 @@ Return<void> RadioConfigResponse::setSimSlotsMappingResponse(const RadioResponse
/* 1.1 Apis */
Return<void> RadioConfigResponse::getPhoneCapabilityResponse(
const RadioResponseInfo& info, const PhoneCapability& phoneCapability) {
const RadioResponseInfo& info, const V1_1::PhoneCapability& phoneCapability) {
rspInfo = info;
phoneCap = phoneCapability;
phoneCap_1_1 = phoneCapability;
parent.notify(info.serial);
return Void();
}
@ -49,7 +50,7 @@ Return<void> RadioConfigResponse::setPreferredDataModemResponse(
}
Return<void> RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& /* info */,
const ModemsConfig& /* mConfig */) {
const V1_1::ModemsConfig& /* mConfig */) {
return Void();
}
@ -60,6 +61,15 @@ Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInf
/* 1.2 Apis */
Return<void> RadioConfigResponse::getSimSlotsStatusResponse_1_2(
const RadioResponseInfo& /* info */,
const ::android::hardware::hidl_vec<SimSlotStatus>& /* slotStatus */) {
const hidl_vec<V1_2::SimSlotStatus>& /* slotStatus */) {
return Void();
}
}
/* 1.3 Apis */
Return<void> RadioConfigResponse::getPhoneCapabilityResponse_1_3(
const RadioResponseInfo& info, const V1_3::PhoneCapability& phoneCapability) {
rspInfo = info;
phoneCap_1_3 = phoneCapability;
parent.notify(info.serial);
return Void();
}