Merge changes from topic "nnapi-aosp-sync"
* changes:
NNAPI: Add execution preference to prepareModel (HAL)
Sync NNAPI Operand and Operation documentation fixes
Fix the spec for TENSOR_QUANT8_ASYMM to match our validation.
Fix the NNAPI HAL documentation about ADD and MUL
NN validation tests
Add validation tests for consistency of model inputs and outputs.
Disable arm32 asan for VtsHalNeuralnetworksV1_1TargetTest
diff --git a/radio/1.2/default/Android.bp b/radio/1.2/default/Android.bp
new file mode 100644
index 0000000..f8ff4c7
--- /dev/null
+++ b/radio/1.2/default/Android.bp
@@ -0,0 +1,39 @@
+cc_binary {
+ name: "android.hardware.radio@1.2-radio-service",
+ init_rc: ["android.hardware.radio@1.2-radio-service.rc"],
+ relative_install_path: "hw",
+ vendor: true,
+ srcs: [
+ "Radio.cpp",
+ "radio-service.cpp",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "liblog",
+ "libutils",
+ "android.hardware.radio@1.2",
+ "android.hardware.radio@1.0",
+ "android.hardware.radio@1.1",
+ ],
+}
+
+cc_binary {
+ name: "android.hardware.radio@1.2-sap-service",
+ init_rc: ["android.hardware.radio@1.2-sap-service.rc"],
+ relative_install_path: "hw",
+ vendor: true,
+ srcs: [
+ "Sap.cpp",
+ "sap-service.cpp",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "liblog",
+ "libutils",
+ "android.hardware.radio@1.2",
+ "android.hardware.radio@1.0",
+ "android.hardware.radio@1.1",
+ ],
+}
diff --git a/radio/1.2/default/Radio.cpp b/radio/1.2/default/Radio.cpp
new file mode 100644
index 0000000..73512e4
--- /dev/null
+++ b/radio/1.2/default/Radio.cpp
@@ -0,0 +1,911 @@
+/*
+ * Copyright (C) 2018 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 "Radio.h"
+
+namespace android {
+namespace hardware {
+namespace radio {
+namespace V1_2 {
+namespace implementation {
+
+// Methods from ::android::hardware::radio::V1_0::IRadio follow.
+Return<void> Radio::setResponseFunctions(
+ const sp<::android::hardware::radio::V1_0::IRadioResponse>& radioResponse,
+ const sp<::android::hardware::radio::V1_0::IRadioIndication>& radioIndication) {
+ mRadioResponse = radioResponse;
+ mRadioIndication = radioIndication;
+ mRadioResponseV1_1 = ::android::hardware::radio::V1_1::IRadioResponse::castFrom(mRadioResponse)
+ .withDefault(nullptr);
+ mRadioIndicationV1_1 =
+ ::android::hardware::radio::V1_1::IRadioIndication::castFrom(mRadioIndication)
+ .withDefault(nullptr);
+ if (mRadioResponseV1_1 == nullptr || mRadioIndicationV1_1 == nullptr) {
+ mRadioResponseV1_1 = nullptr;
+ mRadioIndicationV1_1 = nullptr;
+ }
+ mRadioResponseV1_2 = ::android::hardware::radio::V1_2::IRadioResponse::castFrom(mRadioResponse)
+ .withDefault(nullptr);
+ mRadioIndicationV1_2 =
+ ::android::hardware::radio::V1_2::IRadioIndication::castFrom(mRadioIndication)
+ .withDefault(nullptr);
+ if (mRadioResponseV1_2 == nullptr || mRadioIndicationV1_2 == nullptr) {
+ mRadioResponseV1_2 = nullptr;
+ mRadioIndicationV1_2 = nullptr;
+ }
+ return Void();
+}
+
+Return<void> Radio::getIccCardStatus(int32_t serial) {
+ /**
+ * IRadio-defined request is called from the client and talk to the radio to get
+ * IRadioResponse-defined response or/and IRadioIndication-defined indication back to the
+ * client. This dummy implementation omits and replaces the design and implementation of vendor
+ * codes that needs to handle the receipt of the request and the return of the response from the
+ * radio; this just directly returns a dummy response back to the client.
+ */
+
+ ALOGD("Radio Request: getIccCardStatus is entering");
+
+ if (mRadioResponse != nullptr || mRadioResponseV1_1 != nullptr ||
+ mRadioResponseV1_2 != nullptr) {
+ // Dummy RadioResponseInfo as part of response to return in 1.0, 1.1 and 1.2
+ ::android::hardware::radio::V1_0::RadioResponseInfo info;
+ info.serial = serial;
+ info.type = ::android::hardware::radio::V1_0::RadioResponseType::SOLICITED;
+ info.error = ::android::hardware::radio::V1_0::RadioError::NONE;
+ /**
+ * In IRadio and IRadioResponse 1.2, getIccCardStatus can trigger radio to return
+ * getIccCardStatusResponse_1_2. In their 1.0 and 1.1, getIccCardStatus can trigger radio to
+ * return getIccCardStatusResponse.
+ */
+ if (mRadioResponseV1_2 != nullptr) {
+ // Dummy CardStatus as part of getIccCardStatusResponse_1_2 response to return
+ ::android::hardware::radio::V1_2::CardStatus card_status;
+ card_status.base.cardState = ::android::hardware::radio::V1_0::CardState::ABSENT;
+ card_status.base.gsmUmtsSubscriptionAppIndex = 0;
+ card_status.base.cdmaSubscriptionAppIndex = 0;
+ mRadioResponseV1_2->getIccCardStatusResponse_1_2(info, card_status);
+ ALOGD("Radio Response: getIccCardStatusResponse_1_2 is sent");
+ } else if (mRadioResponseV1_1 != nullptr) {
+ // Dummy CardStatus as part of getIccCardStatusResponse response to return
+ ::android::hardware::radio::V1_0::CardStatus card_status_V1_0;
+ card_status_V1_0.cardState = ::android::hardware::radio::V1_0::CardState::ABSENT;
+ card_status_V1_0.gsmUmtsSubscriptionAppIndex = 0;
+ card_status_V1_0.cdmaSubscriptionAppIndex = 0;
+ mRadioResponseV1_1->getIccCardStatusResponse(info, card_status_V1_0);
+ ALOGD("Radio Response: getIccCardStatusResponse is sent");
+ } else {
+ // Dummy CardStatus as part of getIccCardStatusResponse response to return
+ ::android::hardware::radio::V1_0::CardStatus card_status_V1_0;
+ card_status_V1_0.cardState = ::android::hardware::radio::V1_0::CardState::ABSENT;
+ card_status_V1_0.gsmUmtsSubscriptionAppIndex = 0;
+ card_status_V1_0.cdmaSubscriptionAppIndex = 0;
+ mRadioResponse->getIccCardStatusResponse(info, card_status_V1_0);
+ ALOGD("Radio Response: getIccCardStatusResponse is sent");
+ }
+ } else {
+ ALOGD("mRadioResponse, mRadioResponseV1_1, and mRadioResponseV1_2 are NULL");
+ }
+ return Void();
+}
+
+Return<void> Radio::supplyIccPinForApp(int32_t /* serial */, const hidl_string& /* pin */,
+ const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::supplyIccPukForApp(int32_t /* serial */, const hidl_string& /* puk */,
+ const hidl_string& /* pin */, const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::supplyIccPin2ForApp(int32_t /* serial */, const hidl_string& /* pin2 */,
+ const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::supplyIccPuk2ForApp(int32_t /* serial */, const hidl_string& /* puk2 */,
+ const hidl_string& /* pin2 */,
+ const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::changeIccPinForApp(int32_t /* serial */, const hidl_string& /* oldPin */,
+ const hidl_string& /* newPin */,
+ const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::changeIccPin2ForApp(int32_t /* serial */, const hidl_string& /* oldPin2 */,
+ const hidl_string& /* newPin2 */,
+ const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::supplyNetworkDepersonalization(int32_t /* serial */,
+ const hidl_string& /* netPin */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCurrentCalls(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::dial(int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::Dial& /* dialInfo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getImsiForApp(int32_t /* serial */, const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::hangup(int32_t /* serial */, int32_t /* gsmIndex */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::hangupWaitingOrBackground(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::hangupForegroundResumeBackground(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::switchWaitingOrHoldingAndActive(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::conference(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::rejectCall(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getLastCallFailCause(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getSignalStrength(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getVoiceRegistrationState(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getDataRegistrationState(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getOperator(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setRadioPower(int32_t /* serial */, bool /* on */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendDtmf(int32_t /* serial */, const hidl_string& /* s */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendSms(int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::GsmSmsMessage& /* message */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendSMSExpectMore(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::GsmSmsMessage& /* message */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setupDataCall(
+ int32_t /* serial */, ::android::hardware::radio::V1_0::RadioTechnology /* radioTechnology */,
+ const ::android::hardware::radio::V1_0::DataProfileInfo& /* dataProfileInfo */,
+ bool /* modemCognitive */, bool /* roamingAllowed */, bool /* isRoaming */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::iccIOForApp(int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::IccIo& /* iccIo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendUssd(int32_t /* serial */, const hidl_string& /* ussd */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::cancelPendingUssd(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getClir(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setClir(int32_t /* serial */, int32_t /* status */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCallForwardStatus(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::CallForwardInfo& /* callInfo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCallForward(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::CallForwardInfo& /* callInfo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCallWaiting(int32_t /* serial */, int32_t /* serviceClass */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCallWaiting(int32_t /* serial */, bool /* enable */,
+ int32_t /* serviceClass */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::acknowledgeLastIncomingGsmSms(
+ int32_t /* serial */, bool /* success */,
+ ::android::hardware::radio::V1_0::SmsAcknowledgeFailCause /* cause */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::acceptCall(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::deactivateDataCall(int32_t /* serial */, int32_t /* cid */,
+ bool /* reasonRadioShutDown */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getFacilityLockForApp(int32_t /* serial */, const hidl_string& /* facility */,
+ const hidl_string& /* password */,
+ int32_t /* serviceClass */,
+ const hidl_string& /* appId */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setFacilityLockForApp(int32_t /* serial */, const hidl_string& /* facility */,
+ bool /* lockState */, const hidl_string& /* password */,
+ int32_t /* serviceClass */,
+ const hidl_string& /* appId */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setBarringPassword(int32_t /* serial */, const hidl_string& /* facility */,
+ const hidl_string& /* oldPassword */,
+ const hidl_string& /* newPassword */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getNetworkSelectionMode(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setNetworkSelectionModeAutomatic(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setNetworkSelectionModeManual(int32_t /* serial */,
+ const hidl_string& /* operatorNumeric */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getAvailableNetworks(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::startDtmf(int32_t /* serial */, const hidl_string& /* s */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::stopDtmf(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getBasebandVersion(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::separateConnection(int32_t /* serial */, int32_t /* gsmIndex */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setMute(int32_t /* serial */, bool /* enable */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getMute(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getClip(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getDataCallList(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setSuppServiceNotifications(int32_t /* serial */, bool /* enable */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::writeSmsToSim(
+ int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::SmsWriteArgs& /* smsWriteArgs */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::deleteSmsOnSim(int32_t /* serial */, int32_t /* index */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setBandMode(int32_t /* serial */,
+ ::android::hardware::radio::V1_0::RadioBandMode /* mode */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getAvailableBandModes(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendEnvelope(int32_t /* serial */, const hidl_string& /* command */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendTerminalResponseToSim(int32_t /* serial */,
+ const hidl_string& /* commandResponse */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::handleStkCallSetupRequestFromSim(int32_t /* serial */, bool /* accept */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::explicitCallTransfer(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setPreferredNetworkType(
+ int32_t /* serial */, ::android::hardware::radio::V1_0::PreferredNetworkType /* nwType */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getPreferredNetworkType(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getNeighboringCids(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setLocationUpdates(int32_t /* serial */, bool /* enable */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCdmaSubscriptionSource(
+ int32_t /* serial */, ::android::hardware::radio::V1_0::CdmaSubscriptionSource /* cdmaSub */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCdmaRoamingPreference(
+ int32_t /* serial */, ::android::hardware::radio::V1_0::CdmaRoamingType /* type */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCdmaRoamingPreference(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setTTYMode(int32_t /* serial */,
+ ::android::hardware::radio::V1_0::TtyMode /* mode */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getTTYMode(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setPreferredVoicePrivacy(int32_t /* serial */, bool /* enable */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getPreferredVoicePrivacy(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendCDMAFeatureCode(int32_t /* serial */,
+ const hidl_string& /* featureCode */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendBurstDtmf(int32_t /* serial */, const hidl_string& /* dtmf*/,
+ int32_t /*on*/, int32_t /*off */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendCdmaSms(int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::CdmaSmsMessage& /* sms */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::acknowledgeLastIncomingCdmaSms(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::CdmaSmsAck& /* smsAck */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getGsmBroadcastConfig(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setGsmBroadcastConfig(
+ int32_t /* serial */,
+ const hidl_vec<::android::hardware::radio::V1_0::GsmBroadcastSmsConfigInfo>& /* configInfo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setGsmBroadcastActivation(int32_t /* serial */, bool /* activate */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCdmaBroadcastConfig(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCdmaBroadcastConfig(
+ int32_t /* serial */,
+ const hidl_vec<
+ ::android::hardware::radio::V1_0::CdmaBroadcastSmsConfigInfo>& /* configInfo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCdmaBroadcastActivation(int32_t /* serial */, bool /* activate */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCDMASubscription(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::writeSmsToRuim(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::CdmaSmsWriteArgs& /* cdmaSms */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::deleteSmsOnRuim(int32_t /* serial */, int32_t /* index */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getDeviceIdentity(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::exitEmergencyCallbackMode(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getSmscAddress(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setSmscAddress(int32_t /* serial */, const hidl_string& /* smsc */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::reportSmsMemoryStatus(int32_t /* serial */, bool /* available */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::reportStkServiceIsRunning(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCdmaSubscriptionSource(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::requestIsimAuthentication(int32_t /* serial */,
+ const hidl_string& /* challenge */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::acknowledgeIncomingGsmSmsWithPdu(int32_t /* serial */, bool /* success */,
+ const hidl_string& /* ackPdu */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendEnvelopeWithStatus(int32_t /* serial */,
+ const hidl_string& /* contents */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getVoiceRadioTechnology(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getCellInfoList(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setCellInfoListRate(int32_t /* serial */, int32_t /*rate */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setInitialAttachApn(
+ int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::DataProfileInfo& /* dataProfileInfo */,
+ bool /* modemCognitive */, bool /* isRoaming */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getImsRegistrationState(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendImsSms(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::ImsSmsMessage& /* message */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::iccTransmitApduBasicChannel(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::SimApdu& /* message */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::iccOpenLogicalChannel(int32_t /* serial */, const hidl_string& /* aid*/,
+ int32_t /*p2 */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::iccCloseLogicalChannel(int32_t /* serial */, int32_t /* channelId */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::iccTransmitApduLogicalChannel(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::SimApdu& /* message */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::nvReadItem(int32_t /* serial */,
+ ::android::hardware::radio::V1_0::NvItem /* itemId */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::nvWriteItem(int32_t /* serial */,
+ const ::android::hardware::radio::V1_0::NvWriteItem& /* item */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::nvWriteCdmaPrl(int32_t /* serial */, const hidl_vec<uint8_t>& /* prl */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::nvResetConfig(int32_t /* serial */,
+ ::android::hardware::radio::V1_0::ResetNvType /* resetType */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setUiccSubscription(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::SelectUiccSub& /* uiccSub */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setDataAllowed(int32_t /* serial */, bool /* allow */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getHardwareConfig(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::requestIccSimAuthentication(int32_t /* serial */, int32_t /* authContext */,
+ const hidl_string& /* authData */,
+ const hidl_string& /* aid */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setDataProfile(
+ int32_t /* serial */,
+ const hidl_vec<::android::hardware::radio::V1_0::DataProfileInfo>& /* profiles */,
+ bool /* isRoaming */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::requestShutdown(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getRadioCapability(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setRadioCapability(
+ int32_t /* serial */, const ::android::hardware::radio::V1_0::RadioCapability& /* rc */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::startLceService(int32_t /* serial */, int32_t /* reportInterval */,
+ bool /* pullMode */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::stopLceService(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::pullLceData(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getModemActivityInfo(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setAllowedCarriers(
+ int32_t /* serial */, bool /* allAllowed */,
+ const ::android::hardware::radio::V1_0::CarrierRestrictions& /* carriers */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::getAllowedCarriers(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::sendDeviceState(
+ int32_t /* serial */, ::android::hardware::radio::V1_0::DeviceStateType /* deviceStateType */,
+ bool /* state */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setIndicationFilter(int32_t /* serial */,
+ hidl_bitfield<IndicationFilter> /* indicationFilter */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setSimCardPower(int32_t /* serial */, bool /* powerUp */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::responseAcknowledgement() {
+ // TODO implement
+ return Void();
+}
+
+// Methods from ::android::hardware::radio::V1_1::IRadio follow.
+Return<void> Radio::setCarrierInfoForImsiEncryption(
+ int32_t /* serial */,
+ const ::android::hardware::radio::V1_1::ImsiEncryptionInfo& /* imsiEncryptionInfo */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setSimCardPower_1_1(
+ int32_t /* serial */, ::android::hardware::radio::V1_1::CardPowerState /* powerUp */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::startNetworkScan(
+ int32_t /* serial */,
+ const ::android::hardware::radio::V1_1::NetworkScanRequest& /* request */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::stopNetworkScan(int32_t /* serial */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::startKeepalive(
+ int32_t /* serial */,
+ const ::android::hardware::radio::V1_1::KeepaliveRequest& /* keepalive */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::stopKeepalive(int32_t /* serial */, int32_t /* sessionHandle */) {
+ // TODO implement
+ return Void();
+}
+
+// Methods from ::android::hardware::radio::V1_2::IRadio follow.
+Return<void> Radio::startNetworkScan_1_2(
+ int32_t /* serial */,
+ const ::android::hardware::radio::V1_2::NetworkScanRequest& /* request */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setIndicationFilter_1_2(
+ int32_t /* serial */, hidl_bitfield<IndicationFilter> /* indicationFilter */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setSignalStrengthReportingCriteria(
+ int32_t /* serial */, int32_t /*hysteresisMs*/, int32_t /*hysteresisDb */,
+ const hidl_vec<int32_t>& /* thresholdsDbm */,
+ ::android::hardware::radio::V1_2::AccessNetwork /* accessNetwork */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setLinkCapacityReportingCriteria(
+ int32_t /* serial */, int32_t /*hysteresisMs*/, int32_t /*hysteresisDlKbps*/,
+ int32_t /*hysteresisUlKbps */, const hidl_vec<int32_t>& /* thresholdsDownlinkKbps */,
+ const hidl_vec<int32_t>& /* thresholdsUplinkKbps */,
+ ::android::hardware::radio::V1_2::AccessNetwork /* accessNetwork */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::setupDataCall_1_2(
+ int32_t /* serial */, ::android::hardware::radio::V1_2::AccessNetwork /* accessNetwork */,
+ const ::android::hardware::radio::V1_0::DataProfileInfo& /* dataProfileInfo */,
+ bool /* modemCognitive */, bool /* roamingAllowed */, bool /* isRoaming */,
+ ::android::hardware::radio::V1_2::DataRequestReason /* reason */,
+ const hidl_vec<hidl_string>& /* addresses */, const hidl_vec<hidl_string>& /* dnses */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Radio::deactivateDataCall_1_2(
+ int32_t /* serial */, int32_t /* cid */,
+ ::android::hardware::radio::V1_2::DataRequestReason /* reason */) {
+ // TODO implement
+ return Void();
+}
+
+} // namespace implementation
+} // namespace V1_2
+} // namespace radio
+} // namespace hardware
+} // namespace android
diff --git a/radio/1.2/default/Radio.h b/radio/1.2/default/Radio.h
new file mode 100644
index 0000000..eb8ab5e
--- /dev/null
+++ b/radio/1.2/default/Radio.h
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2018 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_V1_2_RADIO_H
+#define ANDROID_HARDWARE_RADIO_V1_2_RADIO_H
+
+#include <android/hardware/radio/1.2/IRadio.h>
+#include <android/hardware/radio/1.2/IRadioIndication.h>
+#include <android/hardware/radio/1.2/IRadioResponse.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+#include <log/log.h>
+
+namespace android {
+namespace hardware {
+namespace radio {
+namespace V1_2 {
+namespace implementation {
+
+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;
+using ::android::sp;
+
+struct Radio : public IRadio {
+ sp<::android::hardware::radio::V1_0::IRadioResponse> mRadioResponse;
+ sp<::android::hardware::radio::V1_0::IRadioIndication> mRadioIndication;
+ sp<::android::hardware::radio::V1_1::IRadioResponse> mRadioResponseV1_1;
+ sp<::android::hardware::radio::V1_1::IRadioIndication> mRadioIndicationV1_1;
+ sp<::android::hardware::radio::V1_2::IRadioResponse> mRadioResponseV1_2;
+ sp<::android::hardware::radio::V1_2::IRadioIndication> mRadioIndicationV1_2;
+
+ // Methods from ::android::hardware::radio::V1_0::IRadio follow.
+ Return<void> setResponseFunctions(
+ const sp<::android::hardware::radio::V1_0::IRadioResponse>& radioResponse,
+ const sp<::android::hardware::radio::V1_0::IRadioIndication>& radioIndication) override;
+ Return<void> getIccCardStatus(int32_t serial) override;
+ Return<void> supplyIccPinForApp(int32_t serial, const hidl_string& pin,
+ const hidl_string& aid) override;
+ Return<void> supplyIccPukForApp(int32_t serial, const hidl_string& puk, const hidl_string& pin,
+ const hidl_string& aid) override;
+ Return<void> supplyIccPin2ForApp(int32_t serial, const hidl_string& pin2,
+ const hidl_string& aid) override;
+ Return<void> supplyIccPuk2ForApp(int32_t serial, const hidl_string& puk2,
+ const hidl_string& pin2, const hidl_string& aid) override;
+ Return<void> changeIccPinForApp(int32_t serial, const hidl_string& oldPin,
+ const hidl_string& newPin, const hidl_string& aid) override;
+ Return<void> changeIccPin2ForApp(int32_t serial, const hidl_string& oldPin2,
+ const hidl_string& newPin2, const hidl_string& aid) override;
+ Return<void> supplyNetworkDepersonalization(int32_t serial, const hidl_string& netPin) override;
+ Return<void> getCurrentCalls(int32_t serial) override;
+ Return<void> dial(int32_t serial,
+ const ::android::hardware::radio::V1_0::Dial& dialInfo) override;
+ Return<void> getImsiForApp(int32_t serial, const hidl_string& aid) override;
+ Return<void> hangup(int32_t serial, int32_t gsmIndex) override;
+ Return<void> hangupWaitingOrBackground(int32_t serial) override;
+ Return<void> hangupForegroundResumeBackground(int32_t serial) override;
+ Return<void> switchWaitingOrHoldingAndActive(int32_t serial) override;
+ Return<void> conference(int32_t serial) override;
+ Return<void> rejectCall(int32_t serial) override;
+ Return<void> getLastCallFailCause(int32_t serial) override;
+ Return<void> getSignalStrength(int32_t serial) override;
+ Return<void> getVoiceRegistrationState(int32_t serial) override;
+ Return<void> getDataRegistrationState(int32_t serial) override;
+ Return<void> getOperator(int32_t serial) override;
+ Return<void> setRadioPower(int32_t serial, bool on) override;
+ Return<void> sendDtmf(int32_t serial, const hidl_string& s) override;
+ Return<void> sendSms(int32_t serial,
+ const ::android::hardware::radio::V1_0::GsmSmsMessage& message) override;
+ Return<void> sendSMSExpectMore(
+ int32_t serial, const ::android::hardware::radio::V1_0::GsmSmsMessage& message) override;
+ Return<void> setupDataCall(
+ int32_t serial, ::android::hardware::radio::V1_0::RadioTechnology radioTechnology,
+ const ::android::hardware::radio::V1_0::DataProfileInfo& dataProfileInfo,
+ bool modemCognitive, bool roamingAllowed, bool isRoaming) override;
+ Return<void> iccIOForApp(int32_t serial,
+ const ::android::hardware::radio::V1_0::IccIo& iccIo) override;
+ Return<void> sendUssd(int32_t serial, const hidl_string& ussd) override;
+ Return<void> cancelPendingUssd(int32_t serial) override;
+ Return<void> getClir(int32_t serial) override;
+ Return<void> setClir(int32_t serial, int32_t status) override;
+ Return<void> getCallForwardStatus(
+ int32_t serial, const ::android::hardware::radio::V1_0::CallForwardInfo& callInfo) override;
+ Return<void> setCallForward(
+ int32_t serial, const ::android::hardware::radio::V1_0::CallForwardInfo& callInfo) override;
+ Return<void> getCallWaiting(int32_t serial, int32_t serviceClass) override;
+ Return<void> setCallWaiting(int32_t serial, bool enable, int32_t serviceClass) override;
+ Return<void> acknowledgeLastIncomingGsmSms(
+ int32_t serial, bool success,
+ ::android::hardware::radio::V1_0::SmsAcknowledgeFailCause cause) override;
+ Return<void> acceptCall(int32_t serial) override;
+ Return<void> deactivateDataCall(int32_t serial, int32_t cid, bool reasonRadioShutDown) override;
+ Return<void> getFacilityLockForApp(int32_t serial, const hidl_string& facility,
+ const hidl_string& password, int32_t serviceClass,
+ const hidl_string& appId) override;
+ Return<void> setFacilityLockForApp(int32_t serial, const hidl_string& facility, bool lockState,
+ const hidl_string& password, int32_t serviceClass,
+ const hidl_string& appId) override;
+ Return<void> setBarringPassword(int32_t serial, const hidl_string& facility,
+ const hidl_string& oldPassword,
+ const hidl_string& newPassword) override;
+ Return<void> getNetworkSelectionMode(int32_t serial) override;
+ Return<void> setNetworkSelectionModeAutomatic(int32_t serial) override;
+ Return<void> setNetworkSelectionModeManual(int32_t serial,
+ const hidl_string& operatorNumeric) override;
+ Return<void> getAvailableNetworks(int32_t serial) override;
+ Return<void> startDtmf(int32_t serial, const hidl_string& s) override;
+ Return<void> stopDtmf(int32_t serial) override;
+ Return<void> getBasebandVersion(int32_t serial) override;
+ Return<void> separateConnection(int32_t serial, int32_t gsmIndex) override;
+ Return<void> setMute(int32_t serial, bool enable) override;
+ Return<void> getMute(int32_t serial) override;
+ Return<void> getClip(int32_t serial) override;
+ Return<void> getDataCallList(int32_t serial) override;
+ Return<void> setSuppServiceNotifications(int32_t serial, bool enable) override;
+ Return<void> writeSmsToSim(
+ int32_t serial,
+ const ::android::hardware::radio::V1_0::SmsWriteArgs& smsWriteArgs) override;
+ Return<void> deleteSmsOnSim(int32_t serial, int32_t index) override;
+ Return<void> setBandMode(int32_t serial,
+ ::android::hardware::radio::V1_0::RadioBandMode mode) override;
+ Return<void> getAvailableBandModes(int32_t serial) override;
+ Return<void> sendEnvelope(int32_t serial, const hidl_string& command) override;
+ Return<void> sendTerminalResponseToSim(int32_t serial,
+ const hidl_string& commandResponse) override;
+ Return<void> handleStkCallSetupRequestFromSim(int32_t serial, bool accept) override;
+ Return<void> explicitCallTransfer(int32_t serial) override;
+ Return<void> setPreferredNetworkType(
+ int32_t serial, ::android::hardware::radio::V1_0::PreferredNetworkType nwType) override;
+ Return<void> getPreferredNetworkType(int32_t serial) override;
+ Return<void> getNeighboringCids(int32_t serial) override;
+ Return<void> setLocationUpdates(int32_t serial, bool enable) override;
+ Return<void> setCdmaSubscriptionSource(
+ int32_t serial, ::android::hardware::radio::V1_0::CdmaSubscriptionSource cdmaSub) override;
+ Return<void> setCdmaRoamingPreference(
+ int32_t serial, ::android::hardware::radio::V1_0::CdmaRoamingType type) override;
+ Return<void> getCdmaRoamingPreference(int32_t serial) override;
+ Return<void> setTTYMode(int32_t serial,
+ ::android::hardware::radio::V1_0::TtyMode mode) override;
+ Return<void> getTTYMode(int32_t serial) override;
+ Return<void> setPreferredVoicePrivacy(int32_t serial, bool enable) override;
+ Return<void> getPreferredVoicePrivacy(int32_t serial) override;
+ Return<void> sendCDMAFeatureCode(int32_t serial, const hidl_string& featureCode) override;
+ Return<void> sendBurstDtmf(int32_t serial, const hidl_string& dtmf, int32_t on,
+ int32_t off) override;
+ Return<void> sendCdmaSms(int32_t serial,
+ const ::android::hardware::radio::V1_0::CdmaSmsMessage& sms) override;
+ Return<void> acknowledgeLastIncomingCdmaSms(
+ int32_t serial, const ::android::hardware::radio::V1_0::CdmaSmsAck& smsAck) override;
+ Return<void> getGsmBroadcastConfig(int32_t serial) override;
+ Return<void> setGsmBroadcastConfig(
+ int32_t serial,
+ const hidl_vec<::android::hardware::radio::V1_0::GsmBroadcastSmsConfigInfo>& configInfo)
+ override;
+ Return<void> setGsmBroadcastActivation(int32_t serial, bool activate) override;
+ Return<void> getCdmaBroadcastConfig(int32_t serial) override;
+ Return<void> setCdmaBroadcastConfig(
+ int32_t serial,
+ const hidl_vec<::android::hardware::radio::V1_0::CdmaBroadcastSmsConfigInfo>& configInfo)
+ override;
+ Return<void> setCdmaBroadcastActivation(int32_t serial, bool activate) override;
+ Return<void> getCDMASubscription(int32_t serial) override;
+ Return<void> writeSmsToRuim(
+ int32_t serial, const ::android::hardware::radio::V1_0::CdmaSmsWriteArgs& cdmaSms) override;
+ Return<void> deleteSmsOnRuim(int32_t serial, int32_t index) override;
+ Return<void> getDeviceIdentity(int32_t serial) override;
+ Return<void> exitEmergencyCallbackMode(int32_t serial) override;
+ Return<void> getSmscAddress(int32_t serial) override;
+ Return<void> setSmscAddress(int32_t serial, const hidl_string& smsc) override;
+ Return<void> reportSmsMemoryStatus(int32_t serial, bool available) override;
+ Return<void> reportStkServiceIsRunning(int32_t serial) override;
+ Return<void> getCdmaSubscriptionSource(int32_t serial) override;
+ Return<void> requestIsimAuthentication(int32_t serial, const hidl_string& challenge) override;
+ Return<void> acknowledgeIncomingGsmSmsWithPdu(int32_t serial, bool success,
+ const hidl_string& ackPdu) override;
+ Return<void> sendEnvelopeWithStatus(int32_t serial, const hidl_string& contents) override;
+ Return<void> getVoiceRadioTechnology(int32_t serial) override;
+ Return<void> getCellInfoList(int32_t serial) override;
+ Return<void> setCellInfoListRate(int32_t serial, int32_t rate) override;
+ Return<void> setInitialAttachApn(
+ int32_t serial, const ::android::hardware::radio::V1_0::DataProfileInfo& dataProfileInfo,
+ bool modemCognitive, bool isRoaming) override;
+ Return<void> getImsRegistrationState(int32_t serial) override;
+ Return<void> sendImsSms(
+ int32_t serial, const ::android::hardware::radio::V1_0::ImsSmsMessage& message) override;
+ Return<void> iccTransmitApduBasicChannel(
+ int32_t serial, const ::android::hardware::radio::V1_0::SimApdu& message) override;
+ Return<void> iccOpenLogicalChannel(int32_t serial, const hidl_string& aid, int32_t p2) override;
+ Return<void> iccCloseLogicalChannel(int32_t serial, int32_t channelId) override;
+ Return<void> iccTransmitApduLogicalChannel(
+ int32_t serial, const ::android::hardware::radio::V1_0::SimApdu& message) override;
+ Return<void> nvReadItem(int32_t serial,
+ ::android::hardware::radio::V1_0::NvItem itemId) override;
+ Return<void> nvWriteItem(int32_t serial,
+ const ::android::hardware::radio::V1_0::NvWriteItem& item) override;
+ Return<void> nvWriteCdmaPrl(int32_t serial, const hidl_vec<uint8_t>& prl) override;
+ Return<void> nvResetConfig(int32_t serial,
+ ::android::hardware::radio::V1_0::ResetNvType resetType) override;
+ Return<void> setUiccSubscription(
+ int32_t serial, const ::android::hardware::radio::V1_0::SelectUiccSub& uiccSub) override;
+ Return<void> setDataAllowed(int32_t serial, bool allow) override;
+ Return<void> getHardwareConfig(int32_t serial) override;
+ Return<void> requestIccSimAuthentication(int32_t serial, int32_t authContext,
+ const hidl_string& authData,
+ const hidl_string& aid) override;
+ Return<void> setDataProfile(
+ int32_t serial, const hidl_vec<::android::hardware::radio::V1_0::DataProfileInfo>& profiles,
+ bool isRoaming) override;
+ Return<void> requestShutdown(int32_t serial) override;
+ Return<void> getRadioCapability(int32_t serial) override;
+ Return<void> setRadioCapability(
+ int32_t serial, const ::android::hardware::radio::V1_0::RadioCapability& rc) override;
+ Return<void> startLceService(int32_t serial, int32_t reportInterval, bool pullMode) override;
+ Return<void> stopLceService(int32_t serial) override;
+ Return<void> pullLceData(int32_t serial) override;
+ Return<void> getModemActivityInfo(int32_t serial) override;
+ Return<void> setAllowedCarriers(
+ int32_t serial, bool allAllowed,
+ const ::android::hardware::radio::V1_0::CarrierRestrictions& carriers) override;
+ Return<void> getAllowedCarriers(int32_t serial) override;
+ Return<void> sendDeviceState(int32_t serial,
+ ::android::hardware::radio::V1_0::DeviceStateType deviceStateType,
+ bool state) override;
+ Return<void> setIndicationFilter(int32_t serial,
+ hidl_bitfield<IndicationFilter> indicationFilter) override;
+ Return<void> setSimCardPower(int32_t serial, bool powerUp) override;
+ Return<void> responseAcknowledgement() override;
+
+ // Methods from ::android::hardware::radio::V1_1::IRadio follow.
+ Return<void> setCarrierInfoForImsiEncryption(
+ int32_t serial,
+ const ::android::hardware::radio::V1_1::ImsiEncryptionInfo& imsiEncryptionInfo) override;
+ Return<void> setSimCardPower_1_1(
+ int32_t serial, ::android::hardware::radio::V1_1::CardPowerState powerUp) override;
+ Return<void> startNetworkScan(
+ int32_t serial,
+ const ::android::hardware::radio::V1_1::NetworkScanRequest& request) override;
+ Return<void> stopNetworkScan(int32_t serial) override;
+ Return<void> startKeepalive(
+ int32_t serial,
+ const ::android::hardware::radio::V1_1::KeepaliveRequest& keepalive) override;
+ Return<void> stopKeepalive(int32_t serial, int32_t sessionHandle) override;
+
+ // Methods from ::android::hardware::radio::V1_2::IRadio follow.
+ Return<void> startNetworkScan_1_2(
+ int32_t serial,
+ const ::android::hardware::radio::V1_2::NetworkScanRequest& request) override;
+ Return<void> setIndicationFilter_1_2(int32_t serial,
+ hidl_bitfield<IndicationFilter> indicationFilter) override;
+ Return<void> setSignalStrengthReportingCriteria(
+ int32_t serial, int32_t hysteresisMs, int32_t hysteresisDb,
+ const hidl_vec<int32_t>& thresholdsDbm,
+ ::android::hardware::radio::V1_2::AccessNetwork accessNetwork) override;
+ Return<void> setLinkCapacityReportingCriteria(
+ int32_t serial, int32_t hysteresisMs, int32_t hysteresisDlKbps, int32_t hysteresisUlKbps,
+ const hidl_vec<int32_t>& thresholdsDownlinkKbps,
+ const hidl_vec<int32_t>& thresholdsUplinkKbps,
+ ::android::hardware::radio::V1_2::AccessNetwork accessNetwork) override;
+ Return<void> setupDataCall_1_2(
+ int32_t serial, ::android::hardware::radio::V1_2::AccessNetwork accessNetwork,
+ const ::android::hardware::radio::V1_0::DataProfileInfo& dataProfileInfo,
+ bool modemCognitive, bool roamingAllowed, bool isRoaming,
+ ::android::hardware::radio::V1_2::DataRequestReason reason,
+ const hidl_vec<hidl_string>& addresses, const hidl_vec<hidl_string>& dnses) override;
+ Return<void> deactivateDataCall_1_2(
+ int32_t serial, int32_t cid,
+ ::android::hardware::radio::V1_2::DataRequestReason reason) override;
+};
+
+} // namespace implementation
+} // namespace V1_2
+} // namespace radio
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_RADIO_V1_2_RADIO_H
diff --git a/radio/1.2/default/Sap.cpp b/radio/1.2/default/Sap.cpp
new file mode 100644
index 0000000..83efd30
--- /dev/null
+++ b/radio/1.2/default/Sap.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 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 "Sap.h"
+
+namespace android {
+namespace hardware {
+namespace radio {
+namespace V1_2 {
+namespace implementation {
+
+// Methods from ::android::hardware::radio::V1_0::ISap follow.
+Return<void> Sap::setCallback(
+ const sp<::android::hardware::radio::V1_0::ISapCallback>& sapCallback) {
+ mSapCallback = sapCallback;
+ return Void();
+}
+
+Return<void> Sap::connectReq(int32_t /* token */, int32_t /* maxMsgSize */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::disconnectReq(int32_t /* token */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::apduReq(int32_t /* token */,
+ ::android::hardware::radio::V1_0::SapApduType /* type */,
+ const hidl_vec<uint8_t>& /* command */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::transferAtrReq(int32_t /* token */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::powerReq(int32_t /* token */, bool /* state */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::resetSimReq(int32_t /* token */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::transferCardReaderStatusReq(int32_t /* token */) {
+ // TODO implement
+ return Void();
+}
+
+Return<void> Sap::setTransferProtocolReq(
+ int32_t /* token */,
+ ::android::hardware::radio::V1_0::SapTransferProtocol /* transferProtocol */) {
+ // TODO implement
+ return Void();
+}
+
+} // namespace implementation
+} // namespace V1_2
+} // namespace radio
+} // namespace hardware
+} // namespace android
diff --git a/radio/1.2/default/Sap.h b/radio/1.2/default/Sap.h
new file mode 100644
index 0000000..033e877
--- /dev/null
+++ b/radio/1.2/default/Sap.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018 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_V1_2_SAP_H
+#define ANDROID_HARDWARE_RADIO_V1_2_SAP_H
+
+#include <android/hardware/radio/1.2/ISap.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace radio {
+namespace V1_2 {
+namespace implementation {
+
+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;
+using ::android::sp;
+
+struct Sap : public ISap {
+ sp<::android::hardware::radio::V1_0::ISapCallback> mSapCallback;
+ // Methods from ::android::hardware::radio::V1_0::ISap follow.
+ Return<void> setCallback(
+ const sp<::android::hardware::radio::V1_0::ISapCallback>& sapCallback) override;
+ Return<void> connectReq(int32_t token, int32_t maxMsgSize) override;
+ Return<void> disconnectReq(int32_t token) override;
+ Return<void> apduReq(int32_t token, ::android::hardware::radio::V1_0::SapApduType type,
+ const hidl_vec<uint8_t>& command) override;
+ Return<void> transferAtrReq(int32_t token) override;
+ Return<void> powerReq(int32_t token, bool state) override;
+ Return<void> resetSimReq(int32_t token) override;
+ Return<void> transferCardReaderStatusReq(int32_t token) override;
+ Return<void> setTransferProtocolReq(
+ int32_t token,
+ ::android::hardware::radio::V1_0::SapTransferProtocol transferProtocol) override;
+};
+
+} // namespace implementation
+} // namespace V1_2
+} // namespace radio
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_RADIO_V1_2_SAP_H
diff --git a/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc b/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc
new file mode 100644
index 0000000..e126cd8
--- /dev/null
+++ b/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc
@@ -0,0 +1,4 @@
+service vendor.radio-1-2 /vendor/bin/hw/android.hardware.radio@1.2-radio-service
+ class hal
+ user system
+ group system
diff --git a/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc b/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc
new file mode 100644
index 0000000..845e6e5
--- /dev/null
+++ b/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc
@@ -0,0 +1,4 @@
+service vendor.sap-1-2 /vendor/bin/hw/android.hardware.radio@1.2-sap-service
+ class hal
+ user system
+ group system
diff --git a/radio/1.2/default/radio-service.cpp b/radio/1.2/default/radio-service.cpp
new file mode 100644
index 0000000..ae0d3d2
--- /dev/null
+++ b/radio/1.2/default/radio-service.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 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@1.2-radio-service"
+
+#include <android/hardware/radio/1.2/IRadio.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "Radio.h"
+
+using android::hardware::configureRpcThreadpool;
+using android::hardware::joinRpcThreadpool;
+using android::hardware::radio::V1_2::IRadio;
+using android::hardware::radio::V1_2::implementation::Radio;
+using android::sp;
+using android::status_t;
+using android::OK;
+
+int main() {
+ configureRpcThreadpool(1, true);
+
+ sp<IRadio> radio = new Radio;
+ status_t status = radio->registerAsService();
+ ALOGW_IF(status != OK, "Could not register IRadio v1.2");
+ ALOGD("Default service is ready.");
+
+ joinRpcThreadpool();
+ return 1;
+}
\ No newline at end of file
diff --git a/radio/1.2/default/sap-service.cpp b/radio/1.2/default/sap-service.cpp
new file mode 100644
index 0000000..796521d
--- /dev/null
+++ b/radio/1.2/default/sap-service.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 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@1.2-sap-service"
+
+#include <android/hardware/radio/1.2/ISap.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "Sap.h"
+
+using android::hardware::configureRpcThreadpool;
+using android::hardware::joinRpcThreadpool;
+using android::hardware::radio::V1_2::ISap;
+using android::hardware::radio::V1_2::implementation::Sap;
+using android::sp;
+using android::status_t;
+using android::OK;
+
+int main() {
+ configureRpcThreadpool(1, true);
+
+ sp<ISap> sap = new Sap;
+ status_t status = sap->registerAsService();
+ ALOGW_IF(status != OK, "Could not register ISap v1.2");
+ ALOGD("Default service is ready.");
+
+ joinRpcThreadpool();
+ return 1;
+}
\ No newline at end of file