Merge changes from topics "caps_refactor", "phone-cap-revert", "radioconfig-revert"

* changes:
  Revert "Set up IRadioConfig 1.3 skeleton"
  Revert "PhoneCapabilities changes for device capabilities"
  Revert "Update PhoneCapability to use 1.5 UTRAN bands"
This commit is contained in:
Sarah Chin 2020-02-27 05:46:08 +00:00 committed by Gerrit Code Review
commit 48da0e3fe2
26 changed files with 7 additions and 1257 deletions

View file

@ -371,7 +371,10 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.radio.config</name>
<version>1.3</version>
<!--
See compatibility_matrix.4.xml on versioning of radio config HAL.
-->
<version>1.1</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>

View file

@ -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
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

View file

@ -34,7 +34,6 @@ 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"]

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_3::IRadioConfig> radioConfig =
sp<::android::hardware::radio::config::V1_1::IRadioConfig> radioConfig =
::testing::VtsHalHidlTargetTestBase::getService<
::android::hardware::radio::config::V1_3::IRadioConfig>();
::android::hardware::radio::config::V1_1::IRadioConfig>();
/* Enforce Vts tesing with RadioConfig is existed. */
ASSERT_NE(nullptr, radioConfig.get());

View file

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

View file

@ -1,26 +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.hardware.radio@1.1",
"android.hardware.radio@1.4",
"android.hardware.radio@1.5",
"android.hidl.base@1.0",
],
gen_java: true,
}

View file

@ -1,39 +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 {
/**
* 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);
};

View file

@ -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 {
};

View file

@ -1,37 +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 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);
};

View file

@ -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",
],
}

View file

@ -1,120 +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;
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfig follow.
Return<void> RadioConfig::setResponseFunctions(
const sp<V1_0::IRadioConfigResponse>& radioConfigResponse,
const sp<V1_0::IRadioConfigIndication>& 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<void> RadioConfig::getSimSlotsStatus(int32_t /* serial */) {
hidl_vec<V1_0::SimSlotStatus> slotStatus;
RadioResponseInfo info;
mRadioConfigResponse->getSimSlotsStatusResponse(info, slotStatus);
return Void();
}
Return<void> RadioConfig::setSimSlotsMapping(int32_t /* serial */,
const hidl_vec<uint32_t>& /* slotMap */) {
RadioResponseInfo info;
mRadioConfigResponse->setSimSlotsMappingResponse(info);
return Void();
}
// Methods from ::android::hardware::radio::config::V1_1::IRadioConfig follow.
Return<void> RadioConfig::getPhoneCapability(int32_t /* serial */) {
V1_1::PhoneCapability phoneCapability;
RadioResponseInfo info;
mRadioConfigResponseV1_1->getPhoneCapabilityResponse(info, phoneCapability);
return Void();
}
Return<void> RadioConfig::setPreferredDataModem(int32_t /* serial */, uint8_t /* modemId */) {
RadioResponseInfo info;
mRadioConfigResponseV1_1->setPreferredDataModemResponse(info);
return Void();
}
Return<void> RadioConfig::setModemsConfig(int32_t /* serial */,
const V1_1::ModemsConfig& /* modemsConfig */) {
RadioResponseInfo info;
mRadioConfigResponseV1_1->setModemsConfigResponse(info);
return Void();
}
Return<void> RadioConfig::getModemsConfig(int32_t /* serial */) {
V1_1::ModemsConfig modemsConfig;
RadioResponseInfo info;
mRadioConfigResponseV1_1->getModemsConfigResponse(info, modemsConfig);
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
} // namespace radio
} // namespace hardware
} // namespace android

View file

@ -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_RADIOCONFIG_H
#define ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIG_H
#include <android/hardware/radio/config/1.3/IRadioConfig.h>
#include <android/hardware/radio/config/1.3/IRadioConfigIndication.h>
#include <android/hardware/radio/config/1.3/IRadioConfigResponse.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
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<V1_0::IRadioConfigResponse> mRadioConfigResponse;
sp<V1_0::IRadioConfigIndication> mRadioConfigIndication;
sp<V1_1::IRadioConfigResponse> mRadioConfigResponseV1_1;
sp<V1_1::IRadioConfigIndication> mRadioConfigIndicationV1_1;
sp<V1_2::IRadioConfigResponse> mRadioConfigResponseV1_2;
sp<V1_2::IRadioConfigIndication> mRadioConfigIndicationV1_2;
sp<V1_3::IRadioConfigResponse> mRadioConfigResponseV1_3;
sp<V1_3::IRadioConfigIndication> mRadioConfigIndicationV1_3;
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfig follow.
Return<void> setResponseFunctions(
const sp<V1_0::IRadioConfigResponse>& radioConfigResponse,
const sp<V1_0::IRadioConfigIndication>& radioConfigIndication);
Return<void> getSimSlotsStatus(int32_t serial);
Return<void> setSimSlotsMapping(int32_t serial, const hidl_vec<uint32_t>& slotMap);
// Methods from ::android::hardware::radio::config::V1_1::IRadioConfig follow.
Return<void> getPhoneCapability(int32_t serial);
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
} // namespace V1_3
} // namespace config
} // namespace radio
} // namespace hardware
} // namespace android
#endif // ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIG_H

View file

@ -1,45 +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 {
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfigIndication follow.
Return<void> RadioConfigIndication::simSlotsStatusChanged(
RadioIndicationType /* type */, const hidl_vec<V1_0::SimSlotStatus>& /* slotStatus */) {
// TODO implement
return Void();
}
// Methods from ::android::hardware::radio::config::V1_2::IRadioConfigIndication follow.
Return<void> RadioConfigIndication::simSlotsStatusChanged_1_2(
RadioIndicationType /* type */, const hidl_vec<V1_2::SimSlotStatus>& /* slotStatus */) {
// TODO implement
return Void();
}
} // namespace implementation
} // namespace V1_3
} // namespace config
} // namespace radio
} // namespace hardware
} // namespace android

View file

@ -1,55 +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 <android/hardware/radio/config/1.3/IRadioConfigIndication.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.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;
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<void> simSlotsStatusChanged(RadioIndicationType type,
const hidl_vec<V1_0::SimSlotStatus>& slotStatus) override;
// Methods from ::android::hardware::radio::config::V1_2::IRadioConfigIndication follow.
Return<void> simSlotsStatusChanged_1_2(
RadioIndicationType type, const hidl_vec<V1_2::SimSlotStatus>& slotStatus) override;
};
} // namespace implementation
} // namespace V1_3
} // namespace config
} // namespace radio
} // namespace hardware
} // namespace android
#endif // ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGINDICATION_H

View file

@ -1,83 +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 {
// Methods from ::android::hardware::radio::config::V1_0::IRadioConfigResponse follow.
Return<void> RadioConfigResponse::getSimSlotsStatusResponse(
const RadioResponseInfo& /* info */,
const hidl_vec<V1_0::SimSlotStatus>& /* slotStatus */) {
// TODO implement
return Void();
}
Return<void> RadioConfigResponse::setSimSlotsMappingResponse(const RadioResponseInfo& /* info */) {
// TODO implement
return Void();
}
// Methods from ::android::hardware::radio::config::V1_1::IRadioConfigResponse follow.
Return<void> RadioConfigResponse::getPhoneCapabilityResponse(
const RadioResponseInfo& /* info */, const V1_1::PhoneCapability& /* phoneCapability */) {
// TODO implement
return Void();
}
Return<void> RadioConfigResponse::setPreferredDataModemResponse(
const RadioResponseInfo& /* info */) {
// TODO implement
return Void();
}
Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& /* info */) {
// TODO implement
return Void();
}
Return<void> 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<void> RadioConfigResponse::getSimSlotsStatusResponse_1_2(
const RadioResponseInfo& /* info */,
const hidl_vec<V1_2::SimSlotStatus>& /* slotStatus */) {
// TODO implement
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
} // namespace radio
} // namespace hardware
} // namespace android

View file

@ -1,70 +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 <android/hardware/radio/config/1.3/IRadioConfigResponse.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
namespace android {
namespace hardware {
namespace radio {
namespace config {
namespace V1_3 {
namespace implementation {
using namespace ::android::hardware::radio::config;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
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 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 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 RadioResponseInfo& info,
const hidl_vec<V1_2::SimSlotStatus>& slotStatus) override;
// 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
} // namespace V1_3
} // namespace config
} // namespace radio
} // namespace hardware
} // namespace android
#endif // ANDROID_HARDWARE_RADIO_CONFIG_V1_3_RADIOCONFIGRESPONSE_H

View file

@ -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

View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.radio.config</name>
<transport>hwbinder</transport>
<version>1.3</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View file

@ -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 <android/hardware/radio/config/1.3/IRadioConfig.h>
#include <hidl/HidlTransportSupport.h>
#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<IRadioConfig> 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;
}

View file

@ -1,195 +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 android.hardware.radio@1.1::GeranBands;
import android.hardware.radio@1.1::EutranBands;
import android.hardware.radio@1.4::RadioAccessFamily;
import android.hardware.radio@1.5::NgranBands;
import android.hardware.radio@1.5::UtranBands;
/** 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 = 1 << 2,
/** GSM/EDGE capability. */
GERAN = 1 << 3,
/** UMTS capability. */
UTRAN = 1 << 4,
/** LTE capability. */
EUTRAN = 1 << 5,
/** 5G capability. */
NGRAN = 1 << 6,
/** 5G dual connectivity capability. */
EN_DC = 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_APP = 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;
};

View file

@ -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"],
}

View file

@ -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 <radio_config_hidl_hal_utils.h>
INSTANTIATE_TEST_SUITE_P(
PerInstance, RadioConfigHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
::android::hardware::radio::config::V1_3::IRadioConfig::descriptor)),
android::hardware::PrintInstanceNameToString);

View file

@ -1,50 +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 <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());
}
}
}

View file

@ -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 <radio_config_hidl_hal_utils.h>
void RadioConfigHidlTest::SetUp() {
radioConfig = 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<std::mutex> 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<std::mutex> 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;
}

View file

@ -1,129 +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 <android-base/logging.h>
#include <chrono>
#include <condition_variable>
#include <mutex>
#include <android/hardware/radio/config/1.3/IRadioConfig.h>
#include <android/hardware/radio/config/1.3/IRadioConfigIndication.h>
#include <android/hardware/radio/config/1.3/IRadioConfigResponse.h>
#include <android/hardware/radio/config/1.3/types.h>
#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;
using ::android::sp;
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;
#define TIMEOUT_PERIOD 75
class RadioConfigHidlTest;
/* Callback class for radio config response */
class RadioConfigResponse : public V1_3::IRadioConfigResponse {
protected:
RadioConfigHidlTest& parent;
public:
RadioResponseInfo rspInfo;
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<V1_0::SimSlotStatus>& slotStatus);
Return<void> setSimSlotsMappingResponse(const RadioResponseInfo& info);
/* 1.1 Api */
Return<void> getPhoneCapabilityResponse(const RadioResponseInfo& info,
const V1_1::PhoneCapability& phoneCapability);
Return<void> setPreferredDataModemResponse(const RadioResponseInfo& info);
Return<void> getModemsConfigResponse(const RadioResponseInfo& info,
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<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 V1_3::IRadioConfigIndication {
protected:
RadioConfigHidlTest& parent;
public:
RadioConfigIndication(RadioConfigHidlTest& parent);
virtual ~RadioConfigIndication() = default;
/* 1.2 Api */
Return<void> simSlotsStatusChanged_1_2(RadioIndicationType type,
const hidl_vec<V1_2::SimSlotStatus>& slotStatus);
};
// The main test class for Radio config HIDL.
class RadioConfigHidlTest : public ::testing::TestWithParam<std::string> {
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<V1_3::IRadioConfig> radioConfig;
/* radio config response handle */
sp<RadioConfigResponse> radioConfigRsp;
};

View file

@ -1,75 +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 <radio_config_hidl_hal_utils.h>
using namespace ::android::hardware::radio::config;
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 hidl_vec<V1_0::SimSlotStatus>& /* slotStatus */) {
return Void();
}
Return<void> RadioConfigResponse::setSimSlotsMappingResponse(const RadioResponseInfo& /* info */) {
return Void();
}
/* 1.1 Apis */
Return<void> RadioConfigResponse::getPhoneCapabilityResponse(
const RadioResponseInfo& info, const V1_1::PhoneCapability& phoneCapability) {
rspInfo = info;
phoneCap_1_1 = phoneCapability;
parent.notify(info.serial);
return Void();
}
Return<void> RadioConfigResponse::setPreferredDataModemResponse(
const RadioResponseInfo& /* info */) {
return Void();
}
Return<void> RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& /* info */,
const V1_1::ModemsConfig& /* mConfig */) {
return Void();
}
Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& /* info */) {
return Void();
}
/* 1.2 Apis */
Return<void> RadioConfigResponse::getSimSlotsStatusResponse_1_2(
const RadioResponseInfo& /* info */,
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();
}