Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b768d1b9 authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Android (Google) Code Review
Browse files

Revert "Update libradiocompat for IRadioIms in CF" 

Revert submission 20106610-ims-hal-cf

Reason for revert: Test failure with v2/android-app-compat-engprod/g3compat/g3-app-compat-main
Reverted Changes:
I2376f08c4:Update libradiocompat for IRadioIms in CF
Ib2cc006d5:Implement IRadioIms in CF

Change-Id: Id1062e908e067dd3ec01f3ecf43021368d5dc91e
parent 9ea1ce13

radio/aidl/compat/libradiocompat/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ cc_library { 
        "android.hardware.radio.config@1.2",

        "android.hardware.radio.config@1.3",

        "android.hardware.radio.data-V1-ndk",

        "android.hardware.radio.ims-V1-ndk",

        "android.hardware.radio.messaging-V1-ndk",

        "android.hardware.radio.modem-V1-ndk",

        "android.hardware.radio.network-V2-ndk",
@@ -70,9 +69,6 @@ cc_library { 
        "data/RadioResponse-data.cpp",

        "data/RadioData.cpp",

        "data/structs.cpp",

        "ims/RadioIndication-ims.cpp",

        "ims/RadioResponse-ims.cpp",

        "ims/RadioIms.cpp",

        "messaging/RadioIndication-messaging.cpp",

        "messaging/RadioMessaging.cpp",

        "messaging/RadioResponse-messaging.cpp",

radio/aidl/compat/libradiocompat/ims/RadioIms.cpp

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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 <libradiocompat/RadioIms.h>



#include "commonStructs.h"

#include "debug.h"



#include "collections.h"



#define RADIO_MODULE "Ims"



namespace android::hardware::radio::compat {



using ::ndk::ScopedAStatus;

namespace aidl = ::aidl::android::hardware::radio::ims;

constexpr auto ok = &ScopedAStatus::ok;



std::shared_ptr<aidl::IRadioImsResponse> RadioIms::respond() {

    return mCallbackManager->response().imsCb();

}



ScopedAStatus RadioIms::setSrvccCallInfo(

        int32_t serial, const std::vector<aidl::SrvccCall>& /*srvccCalls*/) {

    LOG_CALL << serial;

    LOG(ERROR) << " setSrvccCallInfo is unsupported by HIDL HALs";

    return ok();

}

ScopedAStatus RadioIms::updateImsRegistrationInfo(

        int32_t serial, const aidl::ImsRegistration& /*imsRegistration*/) {

    LOG_CALL << serial;

    LOG(ERROR) << " updateImsRegistrationInfo is unsupported by HIDL HALs";

    return ok();

}

ScopedAStatus RadioIms::startImsTraffic(

        int32_t serial, const std::string& /*token*/, aidl::ImsTrafficType /*imsTrafficType*/,

        ::aidl::android::hardware::radio::AccessNetwork /*accessNetworkType*/) {

    LOG_CALL << serial;

    LOG(ERROR) << " startImsTraffic is unsupported by HIDL HALs";

    return ok();

}

ScopedAStatus RadioIms::stopImsTraffic(int32_t serial, const std::string& /*token*/) {

    LOG_CALL << serial;

    LOG(ERROR) << " stopImsTraffic is unsupported by HIDL HALs";

    return ok();

}

ScopedAStatus RadioIms::triggerEpsFallback(int32_t serial, aidl::EpsFallbackReason /*reason*/) {

    LOG_CALL << serial;

    LOG(ERROR) << " triggerEpsFallback is unsupported by HIDL HALs";

    return ok();

}

ScopedAStatus RadioIms::sendAnbrQuery(

        int32_t serial, aidl::ImsStreamType /*mediaType*/, aidl::ImsStreamDirection /*direction*/,

        int32_t /*bitsPerSecond*/) {

    LOG_CALL << serial;

    LOG(ERROR) << " sendAnbrQuery is unsupported by HIDL HALs";

    return ok();

}



ScopedAStatus RadioIms::setResponseFunctions(

        const std::shared_ptr<aidl::IRadioImsResponse>& response,

        const std::shared_ptr<aidl::IRadioImsIndication>& indication) {

    LOG_CALL << response << ' ' << indication;

    mCallbackManager->setResponseFunctions(response, indication);

    return ok();

}



}  // namespace android::hardware::radio::compat

radio/aidl/compat/libradiocompat/ims/RadioIndication-ims.cpp

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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 <libradiocompat/RadioIndication.h>



#include "commonStructs.h"

#include "debug.h"



#include "collections.h"



#define RADIO_MODULE "ImsIndication"



namespace android::hardware::radio::compat {



using ::aidl::android::hardware::radio::RadioTechnology;

namespace aidl = ::aidl::android::hardware::radio::ims;



void RadioIndication::setResponseFunction(std::shared_ptr<aidl::IRadioImsIndication> imsCb) {

    mImsCb = imsCb;

}



std::shared_ptr<aidl::IRadioImsIndication> RadioIndication::imsCb() {

    return mImsCb.get();

}



}  // namespace android::hardware::radio::compat

radio/aidl/compat/libradiocompat/ims/RadioResponse-ims.cpp

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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 <libradiocompat/RadioResponse.h>



#include "commonStructs.h"

#include "debug.h"



#include "collections.h"



#define RADIO_MODULE "ImsResponse"



namespace android::hardware::radio::compat {



namespace aidl = ::aidl::android::hardware::radio::ims;



void RadioResponse::setResponseFunction(std::shared_ptr<aidl::IRadioImsResponse> imsCb) {

    mImsCb = imsCb;

}



std::shared_ptr<aidl::IRadioImsResponse> RadioResponse::imsCb() {

    return mImsCb.get();

}



}  // namespace android::hardware::radio::compat

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIms.h

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.

 */

#pragma once



#include "RadioCompatBase.h"



#include <aidl/android/hardware/radio/ims/BnRadioIms.h>



namespace android::hardware::radio::compat {



class RadioIms : public RadioCompatBase, public aidl::android::hardware::radio::ims::BnRadioIms {

    ::ndk::ScopedAStatus setSrvccCallInfo(

            int32_t serial,

            const std::vector<::aidl::android::hardware::radio::ims::SrvccCall>& srvccCalls)

            override;

    ::ndk::ScopedAStatus updateImsRegistrationInfo(

            int32_t serial,

            const ::aidl::android::hardware::radio::ims::ImsRegistration& imsRegistration) override;

    ::ndk::ScopedAStatus startImsTraffic(

            int32_t serial, const std::string& token,

            ::aidl::android::hardware::radio::ims::ImsTrafficType imsTrafficType,

            ::aidl::android::hardware::radio::AccessNetwork accessNetworkType) override;

    ::ndk::ScopedAStatus stopImsTraffic(int32_t serial, const std::string& token) override;

    ::ndk::ScopedAStatus triggerEpsFallback(

            int32_t serial,

            ::aidl::android::hardware::radio::ims::EpsFallbackReason reason) override;

    ::ndk::ScopedAStatus sendAnbrQuery(

            int32_t serial, ::aidl::android::hardware::radio::ims::ImsStreamType mediaType,

            ::aidl::android::hardware::radio::ims::ImsStreamDirection direction,

            int32_t bitsPerSecond) override;

    ::ndk::ScopedAStatus setResponseFunctions(

            const std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsResponse>&

                    radioImsResponse,

            const std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsIndication>&

                    radioImsIndication) override;



  protected:

    std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsResponse> respond();



  public:

    using RadioCompatBase::RadioCompatBase;

};



}  // namespace android::hardware::radio::compat