From 98c2c53f8c5948525d6714f82ae6962c99dd5399 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Tue, 25 Feb 2020 00:43:11 +0000 Subject: [PATCH] Revert "Set up IRadioConfig 1.3 skeleton" This reverts commit b071f8ae53f5bbbb1dc091fa527891a6adbeca44. Reason for revert: Change will not be supported by vendor, so HAL for RadioConfig is no longer necessary. Change-Id: I33bf652c6aa2f8516ee6ec1c462a1a575d2a5d27 Merged-In: I2eb83fd2356134ef45a782d99174fdd65f8c5a13 --- .../compatibility_matrix.current.xml | 5 +- current.txt | 4 - radio/config/1.3/Android.bp | 23 ---- radio/config/1.3/IRadioConfig.hal | 31 ----- radio/config/1.3/IRadioConfigIndication.hal | 26 ---- radio/config/1.3/IRadioConfigResponse.hal | 26 ---- radio/config/1.3/default/Android.bp | 28 ---- radio/config/1.3/default/RadioConfig.cpp | 113 ---------------- radio/config/1.3/default/RadioConfig.h | 74 ---------- .../1.3/default/RadioConfigIndication.cpp | 49 ------- .../1.3/default/RadioConfigIndication.h | 59 -------- .../1.3/default/RadioConfigResponse.cpp | 81 ----------- .../config/1.3/default/RadioConfigResponse.h | 77 ----------- ...droid.hardware.radio.config@1.3-service.rc | 7 - .../1.3/default/radio-config-default.xml | 29 ---- radio/config/1.3/default/service.cpp | 41 ------ radio/config/1.3/types.hal | 17 --- radio/config/1.3/vts/functional/Android.bp | 35 ----- .../VtsHalRadioConfigV1_3TargetTest.cpp | 23 ---- .../functional/radio_config_hidl_hal_api.cpp | 19 --- .../functional/radio_config_hidl_hal_test.cpp | 58 -------- .../functional/radio_config_hidl_hal_utils.h | 128 ------------------ .../vts/functional/radio_config_response.cpp | 65 --------- 23 files changed, 4 insertions(+), 1014 deletions(-) delete mode 100644 radio/config/1.3/Android.bp delete mode 100644 radio/config/1.3/IRadioConfig.hal delete mode 100644 radio/config/1.3/IRadioConfigIndication.hal delete mode 100644 radio/config/1.3/IRadioConfigResponse.hal delete mode 100644 radio/config/1.3/default/Android.bp delete mode 100644 radio/config/1.3/default/RadioConfig.cpp delete mode 100644 radio/config/1.3/default/RadioConfig.h delete mode 100644 radio/config/1.3/default/RadioConfigIndication.cpp delete mode 100644 radio/config/1.3/default/RadioConfigIndication.h delete mode 100644 radio/config/1.3/default/RadioConfigResponse.cpp delete mode 100644 radio/config/1.3/default/RadioConfigResponse.h delete mode 100644 radio/config/1.3/default/android.hardware.radio.config@1.3-service.rc delete mode 100644 radio/config/1.3/default/radio-config-default.xml delete mode 100644 radio/config/1.3/default/service.cpp delete mode 100644 radio/config/1.3/types.hal delete mode 100644 radio/config/1.3/vts/functional/Android.bp delete mode 100644 radio/config/1.3/vts/functional/VtsHalRadioConfigV1_3TargetTest.cpp delete mode 100644 radio/config/1.3/vts/functional/radio_config_hidl_hal_api.cpp delete mode 100644 radio/config/1.3/vts/functional/radio_config_hidl_hal_test.cpp delete mode 100644 radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h delete mode 100644 radio/config/1.3/vts/functional/radio_config_response.cpp diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index d0a6601494..21459b745a 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -371,7 +371,10 @@ android.hardware.radio.config - 1.3 + + 1.1 IRadioConfig default diff --git a/current.txt b/current.txt index 0296ef5beb..e4cc618459 100644 --- a/current.txt +++ b/current.txt @@ -641,7 +641,3 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar 7fefa2cc5b3b3be10b5cff5c5dc195385f491d4bf23ca65f9c6b3c30c8753a33 android.hardware.radio@1.5::IRadio e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication 6759e59cef81b5e15137bf99a4cd14236ce0c2974dd307ada265b67e819b9060 android.hardware.radio@1.5::IRadioResponse -55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types -b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig -742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication -7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse diff --git a/radio/config/1.3/Android.bp b/radio/config/1.3/Android.bp deleted file mode 100644 index 88de666618..0000000000 --- a/radio/config/1.3/Android.bp +++ /dev/null @@ -1,23 +0,0 @@ -// This file is autogenerated by hidl-gen -Landroidbp. - -hidl_interface { - name: "android.hardware.radio.config@1.3", - root: "android.hardware", - vndk: { - enabled: true, - }, - srcs: [ - "types.hal", - "IRadioConfig.hal", - "IRadioConfigIndication.hal", - "IRadioConfigResponse.hal", - ], - interfaces: [ - "android.hardware.radio.config@1.0", - "android.hardware.radio.config@1.1", - "android.hardware.radio.config@1.2", - "android.hardware.radio@1.0", - "android.hidl.base@1.0", - ], - gen_java: true, -} diff --git a/radio/config/1.3/IRadioConfig.hal b/radio/config/1.3/IRadioConfig.hal deleted file mode 100644 index a0ce6e089d..0000000000 --- a/radio/config/1.3/IRadioConfig.hal +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.radio.config@1.3; - -import @1.1::IRadioConfig; - -/** - * This interface is used by telephony and telecom to talk to cellular radio for the purpose of - * radio configuration, and it is not associated with any specific modem or slot. - * All the functions have minimum one parameter: - * serial: which corresponds to serial no. of request. Serial numbers must only be memorized for the - * duration of a method call. If clients provide colliding serials (including passing the same - * serial to different methods), multiple responses (one for each method call) must still be served. - */ -interface IRadioConfig extends @1.1::IRadioConfig { - -}; diff --git a/radio/config/1.3/IRadioConfigIndication.hal b/radio/config/1.3/IRadioConfigIndication.hal deleted file mode 100644 index 9ef496c4ba..0000000000 --- a/radio/config/1.3/IRadioConfigIndication.hal +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.radio.config@1.3; - -import @1.2::IRadioConfigIndication; - -/** - * Interface declaring unsolicited radio config indications. - */ -interface IRadioConfigIndication extends @1.2::IRadioConfigIndication { - -}; diff --git a/radio/config/1.3/IRadioConfigResponse.hal b/radio/config/1.3/IRadioConfigResponse.hal deleted file mode 100644 index 9c4c971f9f..0000000000 --- a/radio/config/1.3/IRadioConfigResponse.hal +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.radio.config@1.3; - -import @1.2::IRadioConfigResponse; - -/** - * Interface declaring response functions to solicited radio config requests. - */ -interface IRadioConfigResponse extends @1.2::IRadioConfigResponse { - -}; diff --git a/radio/config/1.3/default/Android.bp b/radio/config/1.3/default/Android.bp deleted file mode 100644 index 163c5c5d63..0000000000 --- a/radio/config/1.3/default/Android.bp +++ /dev/null @@ -1,28 +0,0 @@ -cc_binary { - name: "android.hardware.radio.config@1.3-service", - init_rc: ["android.hardware.radio.config@1.3-service.rc"], - relative_install_path: "hw", - vintf_fragments: ["radio-config-default.xml"], - vendor: true, - srcs: [ - "RadioConfig.cpp", - "RadioConfigIndication.cpp", - "RadioConfigResponse.cpp", - "service.cpp", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "android.hardware.radio.config@1.0", - "android.hardware.radio.config@1.1", - "android.hardware.radio.config@1.2", - "android.hardware.radio.config@1.3", - "android.hardware.radio@1.0", - "android.hardware.radio@1.1", - "android.hardware.radio@1.2", - "android.hardware.radio@1.3", - "android.hardware.radio@1.4", - "android.hardware.radio@1.5", - ], -} diff --git a/radio/config/1.3/default/RadioConfig.cpp b/radio/config/1.3/default/RadioConfig.cpp deleted file mode 100644 index c28119c311..0000000000 --- a/radio/config/1.3/default/RadioConfig.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "RadioConfig.h" - -namespace android { -namespace hardware { -namespace radio { -namespace config { -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 RadioConfig::setResponseFunctions( - const sp& radioConfigResponse, - const sp& radioConfigIndication) { - mRadioConfigResponse = radioConfigResponse; - mRadioConfigIndication = radioConfigIndication; - - mRadioConfigResponseV1_3 = - V1_3::IRadioConfigResponse::castFrom(mRadioConfigResponse).withDefault(nullptr); - mRadioConfigIndicationV1_3 = - V1_3::IRadioConfigIndication::castFrom(mRadioConfigIndication).withDefault(nullptr); - if (mRadioConfigResponseV1_3 == nullptr || mRadioConfigIndicationV1_3 == nullptr) { - mRadioConfigResponseV1_3 = nullptr; - mRadioConfigIndicationV1_3 = nullptr; - } - - mRadioConfigResponseV1_2 = - V1_2::IRadioConfigResponse::castFrom(mRadioConfigResponse).withDefault(nullptr); - mRadioConfigIndicationV1_2 = - V1_2::IRadioConfigIndication::castFrom(mRadioConfigIndication).withDefault(nullptr); - if (mRadioConfigResponseV1_2 == nullptr || mRadioConfigIndicationV1_2 == nullptr) { - mRadioConfigResponseV1_2 = nullptr; - mRadioConfigIndicationV1_2 = nullptr; - } - - mRadioConfigResponseV1_1 = - V1_1::IRadioConfigResponse::castFrom(mRadioConfigResponse).withDefault(nullptr); - mRadioConfigIndicationV1_1 = - V1_1::IRadioConfigIndication::castFrom(mRadioConfigIndication).withDefault(nullptr); - if (mRadioConfigResponseV1_1 == nullptr || mRadioConfigIndicationV1_1 == nullptr) { - mRadioConfigResponseV1_1 = nullptr; - mRadioConfigIndicationV1_1 = nullptr; - } - - return Void(); -} - -Return RadioConfig::getSimSlotsStatus(int32_t /* serial */) { - hidl_vec slotStatus; - RadioResponseInfo info; - mRadioConfigResponse->getSimSlotsStatusResponse(info, slotStatus); - return Void(); -} - -Return RadioConfig::setSimSlotsMapping(int32_t /* serial */, - const hidl_vec& /* slotMap */) { - RadioResponseInfo info; - mRadioConfigResponse->setSimSlotsMappingResponse(info); - return Void(); -} - -// Methods from ::android::hardware::radio::config::V1_1::IRadioConfig follow. -Return RadioConfig::getPhoneCapability(int32_t /* serial */) { - V1_1::PhoneCapability phoneCapability; - RadioResponseInfo info; - mRadioConfigResponseV1_1->getPhoneCapabilityResponse(info, phoneCapability); - return Void(); -} - -Return RadioConfig::setPreferredDataModem(int32_t /* serial */, uint8_t /* modemId */) { - RadioResponseInfo info; - mRadioConfigResponseV1_1->setPreferredDataModemResponse(info); - return Void(); -} - -Return RadioConfig::setModemsConfig(int32_t /* serial */, - const V1_1::ModemsConfig& /* modemsConfig */) { - RadioResponseInfo info; - mRadioConfigResponseV1_1->setModemsConfigResponse(info); - return Void(); -} - -Return RadioConfig::getModemsConfig(int32_t /* serial */) { - V1_1::ModemsConfig modemsConfig; - RadioResponseInfo info; - mRadioConfigResponseV1_1->getModemsConfigResponse(info, modemsConfig); - return Void(); -} - -} // namespace implementation -} // namespace V1_3 -} // namespace config -} // namespace radio -} // namespace hardware -} // namespace android diff --git a/radio/config/1.3/default/RadioConfig.h b/radio/config/1.3/default/RadioConfig.h deleted file mode 100644 index 00585e6df2..0000000000 --- a/radio/config/1.3/default/RadioConfig.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIG_H -#define ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIG_H - -#include -#include -#include -#include -#include - -namespace android { -namespace hardware { -namespace radio { -namespace config { -namespace V1_3 { -namespace implementation { - -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; - -struct RadioConfig : public V1_3::IRadioConfig { - sp mRadioConfigResponse; - sp mRadioConfigIndication; - sp mRadioConfigResponseV1_1; - sp mRadioConfigIndicationV1_1; - sp mRadioConfigResponseV1_2; - sp mRadioConfigIndicationV1_2; - sp mRadioConfigResponseV1_3; - sp mRadioConfigIndicationV1_3; - - // Methods from ::android::hardware::radio::config::V1_0::IRadioConfig follow. - Return setResponseFunctions( - const sp& radioConfigResponse, - const sp& radioConfigIndication); - Return getSimSlotsStatus(int32_t serial); - Return setSimSlotsMapping(int32_t serial, const hidl_vec& slotMap); - - // Methods from ::android::hardware::radio::config::V1_1::IRadioConfig follow. - Return getPhoneCapability(int32_t serial); - Return setPreferredDataModem(int32_t serial, uint8_t modemId); - Return setModemsConfig(int32_t serial, const V1_1::ModemsConfig& modemsConfig); - Return getModemsConfig(int32_t serial); -}; - -} // namespace implementation -} // namespace V1_3 -} // namespace config -} // namespace radio -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIG_H diff --git a/radio/config/1.3/default/RadioConfigIndication.cpp b/radio/config/1.3/default/RadioConfigIndication.cpp deleted file mode 100644 index eb77a48ec1..0000000000 --- a/radio/config/1.3/default/RadioConfigIndication.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "RadioConfigIndication.h" - -namespace android { -namespace hardware { -namespace radio { -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 RadioConfigIndication::simSlotsStatusChanged( - RadioIndicationType /* type */, const hidl_vec& /* slotStatus */) { - // TODO implement - return Void(); -} - -// Methods from ::android::hardware::radio::config::V1_2::IRadioConfigIndication follow. -Return RadioConfigIndication::simSlotsStatusChanged_1_2( - RadioIndicationType /* type */, const hidl_vec& /* slotStatus */) { - // TODO implement - return Void(); -} - -} // namespace implementation -} // namespace V1_3 -} // namespace config -} // namespace radio -} // namespace hardware -} // namespace android diff --git a/radio/config/1.3/default/RadioConfigIndication.h b/radio/config/1.3/default/RadioConfigIndication.h deleted file mode 100644 index 3697492375..0000000000 --- a/radio/config/1.3/default/RadioConfigIndication.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGINDICATION_H -#define ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGINDICATION_H - -#include -#include -#include - -namespace android { -namespace hardware { -namespace radio { -namespace config { -namespace V1_3 { -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; - -struct RadioConfigIndication : public IRadioConfigIndication { - // Methods from ::android::hardware::radio::config::V1_0::IRadioConfigIndication follow. - Return simSlotsStatusChanged(RadioIndicationType type, - const hidl_vec& slotStatus) override; - - // Methods from ::android::hardware::radio::config::V1_2::IRadioConfigIndication follow. - Return simSlotsStatusChanged_1_2( - RadioIndicationType type, const hidl_vec& slotStatus) override; -}; - -} // namespace implementation -} // namespace V1_3 -} // namespace config -} // namespace radio -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGINDICATION_H diff --git a/radio/config/1.3/default/RadioConfigResponse.cpp b/radio/config/1.3/default/RadioConfigResponse.cpp deleted file mode 100644 index 48e81dade3..0000000000 --- a/radio/config/1.3/default/RadioConfigResponse.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "RadioConfigResponse.h" - -namespace android { -namespace hardware { -namespace radio { -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 RadioConfigResponse::getSimSlotsStatusResponse( - const RadioResponseInfo& /* info */, - const hidl_vec& /* slotStatus */) { - // TODO implement - return Void(); -} - -Return RadioConfigResponse::setSimSlotsMappingResponse(const RadioResponseInfo& /* info */) { - // TODO implement - return Void(); -} - -// Methods from ::android::hardware::radio::config::V1_1::IRadioConfigResponse follow. -Return RadioConfigResponse::getPhoneCapabilityResponse( - const RadioResponseInfo& /* info */, const V1_1::PhoneCapability& /* phoneCapability */) { - // TODO implement - return Void(); -} - -Return RadioConfigResponse::setPreferredDataModemResponse( - const RadioResponseInfo& /* info */) { - // TODO implement - return Void(); -} - -Return RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& /* info */) { - // TODO implement - return Void(); -} - -Return RadioConfigResponse::getModemsConfigResponse( - const RadioResponseInfo& /* info */, const V1_1::ModemsConfig& /* modemsConfig */) { - // TODO implement - return Void(); -} - -// Methods from ::android::hardware::radio::config::V1_2::IRadioConfigResponse follow. -Return RadioConfigResponse::getSimSlotsStatusResponse_1_2( - const RadioResponseInfo& /* info */, - const hidl_vec& /* slotStatus */) { - // TODO implement - return Void(); -} - -} // namespace implementation -} // namespace V1_3 -} // namespace config -} // namespace radio -} // namespace hardware -} // namespace android diff --git a/radio/config/1.3/default/RadioConfigResponse.h b/radio/config/1.3/default/RadioConfigResponse.h deleted file mode 100644 index 0f0033fa6a..0000000000 --- a/radio/config/1.3/default/RadioConfigResponse.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGRESPONSE_H -#define ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGRESPONSE_H - -#include -#include -#include - -namespace android { -namespace hardware { -namespace radio { -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 ::android::hardware::hidl_vec; -using ::android::hardware::Return; -using ::android::hardware::Void; - -struct RadioConfigResponse : public IRadioConfigResponse { - // Methods from ::android::hardware::radio::config::V1_0::IRadioConfigResponse follow. - Return getSimSlotsStatusResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info, - const hidl_vec<::android::hardware::radio::config::V1_0::SimSlotStatus>& slotStatus) - override; - Return setSimSlotsMappingResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info) override; - - // Methods from ::android::hardware::radio::config::V1_1::IRadioConfigResponse follow. - Return getPhoneCapabilityResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info, - const ::android::hardware::radio::config::V1_1::PhoneCapability& phoneCapability) - override; - Return setPreferredDataModemResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info) override; - Return setModemsConfigResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info) override; - Return getModemsConfigResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info, - const ::android::hardware::radio::config::V1_1::ModemsConfig& modemsConfig) override; - - // Methods from ::android::hardware::radio::config::V1_2::IRadioConfigResponse follow. - Return getSimSlotsStatusResponse_1_2( - const ::android::hardware::radio::V1_0::RadioResponseInfo& info, - const hidl_vec<::android::hardware::radio::config::V1_2::SimSlotStatus>& slotStatus) - override; - - // Methods from ::android::hidl::base::V1_0::IBase follow. -}; - -} // namespace implementation -} // namespace V1_3 -} // namespace config -} // namespace radio -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGRESPONSE_H diff --git a/radio/config/1.3/default/android.hardware.radio.config@1.3-service.rc b/radio/config/1.3/default/android.hardware.radio.config@1.3-service.rc deleted file mode 100644 index 6df9b52ba5..0000000000 --- a/radio/config/1.3/default/android.hardware.radio.config@1.3-service.rc +++ /dev/null @@ -1,7 +0,0 @@ -service vendor.radio-config-hal-1-3 /vendor/bin/hw/android.hardware.radio.config@1.3-service - interface android.hardware.radio.config@1.0::IRadioConfig default - interface android.hardware.radio.config@1.1::IRadioConfig default - interface android.hardware.radio.config@1.3::IRadioConfig default - class hal - user system - group system diff --git a/radio/config/1.3/default/radio-config-default.xml b/radio/config/1.3/default/radio-config-default.xml deleted file mode 100644 index 72f363e30f..0000000000 --- a/radio/config/1.3/default/radio-config-default.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - android.hardware.radio.config - hwbinder - 1.3 - - IRadioConfig - default - - - diff --git a/radio/config/1.3/default/service.cpp b/radio/config/1.3/default/service.cpp deleted file mode 100644 index b1e67366e9..0000000000 --- a/radio/config/1.3/default/service.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.1 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "android.hardware.radio.config@1.3-service" - -#include -#include - -#include "RadioConfig.h" - -using android::OK; -using android::sp; -using android::status_t; -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; -using android::hardware::radio::config::V1_3::IRadioConfig; -using android::hardware::radio::config::V1_3::implementation::RadioConfig; - -int main() { - configureRpcThreadpool(1, true); - sp radioConfig = new RadioConfig; - const status_t status = radioConfig->registerAsService(); - ALOGW_IF(status != OK, "Could not register IRadioConfig 1.3"); - ALOGD("Default service is ready."); - - joinRpcThreadpool(); - return 1; -} diff --git a/radio/config/1.3/types.hal b/radio/config/1.3/types.hal deleted file mode 100644 index 866002acad..0000000000 --- a/radio/config/1.3/types.hal +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.radio.config@1.3; diff --git a/radio/config/1.3/vts/functional/Android.bp b/radio/config/1.3/vts/functional/Android.bp deleted file mode 100644 index 6b28faf7a0..0000000000 --- a/radio/config/1.3/vts/functional/Android.bp +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright (C) 2019 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -cc_test { - name: "VtsHalRadioConfigV1_3TargetTest", - defaults: ["VtsHalTargetTestDefaults"], - srcs: [ - "radio_config_hidl_hal_api.cpp", - "radio_config_hidl_hal_test.cpp", - "radio_config_response.cpp", - "VtsHalRadioConfigV1_3TargetTest.cpp", - ], - static_libs: [ - "RadioVtsTestUtilBase", - "android.hardware.radio.config@1.0", - "android.hardware.radio.config@1.1", - "android.hardware.radio.config@1.2", - "android.hardware.radio.config@1.3", - ], - header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], -} diff --git a/radio/config/1.3/vts/functional/VtsHalRadioConfigV1_3TargetTest.cpp b/radio/config/1.3/vts/functional/VtsHalRadioConfigV1_3TargetTest.cpp deleted file mode 100644 index 3bacacf63c..0000000000 --- a/radio/config/1.3/vts/functional/VtsHalRadioConfigV1_3TargetTest.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -INSTANTIATE_TEST_SUITE_P( - PerInstance, RadioConfigHidlTest, - testing::ValuesIn(android::hardware::getAllHalInstanceNames( - ::android::hardware::radio::config::V1_3::IRadioConfig::descriptor)), - android::hardware::PrintInstanceNameToString); diff --git a/radio/config/1.3/vts/functional/radio_config_hidl_hal_api.cpp b/radio/config/1.3/vts/functional/radio_config_hidl_hal_api.cpp deleted file mode 100644 index 07e9eded5a..0000000000 --- a/radio/config/1.3/vts/functional/radio_config_hidl_hal_api.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk()) diff --git a/radio/config/1.3/vts/functional/radio_config_hidl_hal_test.cpp b/radio/config/1.3/vts/functional/radio_config_hidl_hal_test.cpp deleted file mode 100644 index dbb4bf44e3..0000000000 --- a/radio/config/1.3/vts/functional/radio_config_hidl_hal_test.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -void RadioConfigHidlTest::SetUp() { - radioConfig = ::android::hardware::radio::config::V1_3::IRadioConfig::getService(GetParam()); - ASSERT_NE(nullptr, radioConfig.get()); - - radioConfigRsp = new (std::nothrow) RadioConfigResponse(*this); - ASSERT_NE(nullptr, radioConfigRsp.get()); - - count_ = 0; - - radioConfig->setResponseFunctions(radioConfigRsp, nullptr); -} - -/* - * Notify that the response message is received. - */ -void RadioConfigHidlTest::notify(int receivedSerial) { - std::unique_lock lock(mtx_); - if (serial == receivedSerial) { - count_++; - cv_.notify_one(); - } -} - -/* - * Wait till the response message is notified or till TIMEOUT_PERIOD. - */ -std::cv_status RadioConfigHidlTest::wait() { - std::unique_lock lock(mtx_); - - std::cv_status status = std::cv_status::no_timeout; - auto now = std::chrono::system_clock::now(); - while (count_ == 0) { - status = cv_.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD)); - if (status == std::cv_status::timeout) { - return status; - } - } - count_--; - return status; -} diff --git a/radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h b/radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h deleted file mode 100644 index 9b78c04944..0000000000 --- a/radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -#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 ::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::RadioResponseInfo; -using ::android::hardware::radio::V1_0::RadioResponseType; - -#define TIMEOUT_PERIOD 75 - -class RadioConfigHidlTest; - -/* Callback class for radio config response */ -class RadioConfigResponse : public ::android::hardware::radio::config::V1_3::IRadioConfigResponse { - protected: - RadioConfigHidlTest& parent; - - public: - RadioResponseInfo rspInfo; - PhoneCapability phoneCap; - - RadioConfigResponse(RadioConfigHidlTest& parent); - virtual ~RadioConfigResponse() = default; - - /* 1.0 Api */ - Return getSimSlotsStatusResponse( - const RadioResponseInfo& info, - const hidl_vec<::android::hardware::radio::config::V1_0::SimSlotStatus>& slotStatus); - - Return setSimSlotsMappingResponse(const RadioResponseInfo& info); - - /* 1.1 Api */ - Return getPhoneCapabilityResponse(const RadioResponseInfo& info, - const PhoneCapability& phoneCapability); - - Return setPreferredDataModemResponse(const RadioResponseInfo& info); - - Return getModemsConfigResponse(const RadioResponseInfo& info, - const ModemsConfig& mConfig); - - Return setModemsConfigResponse(const RadioResponseInfo& info); - - /* 1.2 Api */ - Return getSimSlotsStatusResponse_1_2(const RadioResponseInfo& info, - const hidl_vec& slotStatus); -}; - -/* Callback class for radio config indication */ -class RadioConfigIndication - : public ::android::hardware::radio::config::V1_3::IRadioConfigIndication { - protected: - RadioConfigHidlTest& parent; - - public: - RadioConfigIndication(RadioConfigHidlTest& parent); - virtual ~RadioConfigIndication() = default; - - /* 1.2 Api */ - Return simSlotsStatusChanged_1_2( - ::android::hardware::radio::V1_0::RadioIndicationType type, - const hidl_vec& slotStatus); -}; - -// The main test class for Radio config HIDL. -class RadioConfigHidlTest : public ::testing::TestWithParam { - protected: - std::mutex mtx_; - std::condition_variable cv_; - int count_; - - public: - virtual void SetUp() override; - - /* Used as a mechanism to inform the test about data/event callback */ - void notify(int receivedSerial); - - /* Test code calls this function to wait for response */ - std::cv_status wait(); - - void updateSimCardStatus(); - - /* Serial number for radio request */ - int serial; - - /* radio config service handle */ - sp<::android::hardware::radio::config::V1_3::IRadioConfig> radioConfig; - - /* radio config response handle */ - sp radioConfigRsp; -}; diff --git a/radio/config/1.3/vts/functional/radio_config_response.cpp b/radio/config/1.3/vts/functional/radio_config_response.cpp deleted file mode 100644 index 1ca960eae9..0000000000 --- a/radio/config/1.3/vts/functional/radio_config_response.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -using ::android::hardware::radio::V1_0::RadioResponseInfo; - -// SimSlotStatus slotStatus; - -RadioConfigResponse::RadioConfigResponse(RadioConfigHidlTest& parent) : parent(parent) {} - -/* 1.0 Apis */ -Return RadioConfigResponse::getSimSlotsStatusResponse( - const RadioResponseInfo& /* info */, - const ::android::hardware::hidl_vec< - ::android::hardware::radio::config::V1_0::SimSlotStatus>& /* slotStatus */) { - return Void(); -} - -Return RadioConfigResponse::setSimSlotsMappingResponse(const RadioResponseInfo& /* info */) { - return Void(); -} - -/* 1.1 Apis */ -Return RadioConfigResponse::getPhoneCapabilityResponse( - const RadioResponseInfo& info, const PhoneCapability& phoneCapability) { - rspInfo = info; - phoneCap = phoneCapability; - parent.notify(info.serial); - return Void(); -} - -Return RadioConfigResponse::setPreferredDataModemResponse( - const RadioResponseInfo& /* info */) { - return Void(); -} - -Return RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& /* info */, - const ModemsConfig& /* mConfig */) { - return Void(); -} - -Return RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& /* info */) { - return Void(); -} - -/* 1.2 Apis */ -Return RadioConfigResponse::getSimSlotsStatusResponse_1_2( - const RadioResponseInfo& /* info */, - const ::android::hardware::hidl_vec& /* slotStatus */) { - return Void(); -} \ No newline at end of file