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

Commit 48da0e3f authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

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"
parents d7975bf8 98c2c53f

compatibility_matrices/compatibility_matrix.current.xml

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

current.txt

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

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>