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

Commit 80a755fa authored by Sarah Chin's avatar Sarah Chin
Browse files

Revert "PhoneCapabilities changes for device capabilities" 

Reston for revert: Change not supported by modem
This reverts commit 322c4cc2.

Change-Id: I9b268f41614149b5cd55caf3d730b25bb1f885e9
parent af09f9de

radio/1.5/vts/functional/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -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"]

radio/1.5/vts/functional/radio_hidl_hal_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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());

radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

radio/config/1.3/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ hidl_interface { 
        "android.hardware.radio.config@1.1",

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

        "android.hardware.radio@1.0",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.4",

        "android.hardware.radio@1.5",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

radio/config/1.3/IRadioConfig.hal

+1 −9
Original line number Diff line number Diff line
@@ -27,13 +27,5 @@ import @1.1::IRadioConfig; 
 * serial to different methods), multiple responses (one for each method call) must still be served.

 */

interface IRadioConfig extends @1.1::IRadioConfig {

    /**

     * Request current phone capability.

     *

     * @param serial Serial number of request.

     *

     * Response callback is IRadioResponse.getPhoneCapabilityResponse_1_3() which

     * will return <@1.3::PhoneCapability>.

     */

    oneway getPhoneCapability_1_3(int32_t serial);



};