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

Commit 71f7f2fb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

PhoneCapabilities changes for device capabilities am: e1d1b0b9 am: 3b5db56b 

Change-Id: I2e3f1ccca4cfe21d1337f2f52e6893617f651bb3
parents 20e878d7 3b5db56b

current.txt

+3 −3
Original line number Diff line number Diff line
@@ -645,10 +645,10 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar 
7a0a3382cca78d13a55e856b14b7fb025987f52c2adeab5747cd584391cd3cc7 android.hardware.radio@1.5::IRadio

20d52e66fd548f89bcb98cda42749a591ce8f439a2a7148617adac0c967ad937 android.hardware.radio@1.5::IRadioIndication

c7b4a0debd3bb8815a463d11194487c7eef81bca584f558d7ba74c34b18d7e3f android.hardware.radio@1.5::IRadioResponse

55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types

b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig

5971a891d7d8843e9fb9f44583a9a0a265ec42fd5e4e1c95c9803454d21fabf7 android.hardware.radio.config@1.3::types

a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig

742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication

7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse

0006ab8e8b0910cbd3bbb08d5f17d5fac7d65a2bdad5f2334e4851db9d1e6fa8 android.hardware.radio.config@1.3::IRadioConfigResponse

##

# END Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present

##

radio/1.5/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 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_1::IRadioConfig> radioConfig =

    sp<::android::hardware::radio::config::V1_3::IRadioConfig> radioConfig =

            ::testing::VtsHalHidlTargetTestBase::getService<

                    ::android::hardware::radio::config::V1_1::IRadioConfig>();

                    ::android::hardware::radio::config::V1_3::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.1/IRadioConfig.h>

#include <android/hardware/radio/config/1.3/IRadioConfig.h>



#include <android/hardware/radio/1.5/IRadio.h>

#include <android/hardware/radio/1.5/IRadioIndication.h>

radio/config/1.3/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 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,