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

Commit 05573100 authored by Xin Li's avatar Xin Li
Browse files

Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master 

Bug: 111615259
Change-Id: Ib388606168aeebd8efd0396a825cd6fda5898f0a
parents 345bac07 20d21db0

audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ service vendor.audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service 
    class hal

    user audioserver

    # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)

    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct

    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct wakelock

    capabilities BLOCK_SUSPEND

    ioprio rt 4

    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks

    # audioflinger restarts itself when it loses connection with the hal

audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace utility { 
class Environment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    using TearDownFunc = std::function<void()>;

    void registerTearDown(TearDownFunc&& tearDown) { tearDowns.push_back(std::move(tearDown)); }

    void registerTearDown(TearDownFunc&& tearDown) { tearDowns.push_front(std::move(tearDown)); }



   private:

    void HidlTearDown() override {

audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp

+11 −6
Original line number Diff line number Diff line
@@ -106,7 +106,10 @@ using namespace ::android::hardware::audio::common::test::utility; 
static auto okOrNotSupported = {Result::OK, Result::NOT_SUPPORTED};

static auto okOrNotSupportedOrInvalidArgs = {Result::OK, Result::NOT_SUPPORTED,

                                             Result::INVALID_ARGUMENTS};

static auto okOrInvalidStateOrNotSupported = {Result::OK, Result::INVALID_STATE,

                                              Result::NOT_SUPPORTED};

static auto invalidArgsOrNotSupported = {Result::INVALID_ARGUMENTS, Result::NOT_SUPPORTED};

static auto invalidStateOrNotSupported = {Result::INVALID_STATE, Result::NOT_SUPPORTED};



class AudioHidlTestEnvironment : public ::Environment {

   public:
@@ -555,11 +558,11 @@ TEST_F(AudioPrimaryHidlTest, SetConnectedState) { 
            address.device = deviceType;

            auto ret = device->setConnectedState(address, state);

            ASSERT_TRUE(ret.isOk());

            if (res == Result::NOT_SUPPORTED) {

            if (ret == Result::NOT_SUPPORTED) {

                doc::partialTest("setConnectedState is not supported");

                return;

            }

            ASSERT_OK(res);

            ASSERT_OK(ret);

        }

    }

}
@@ -949,8 +952,6 @@ TEST_IO_STREAM(RemoveNonExistingEffect, "Removing a non existing effect should f 
TEST_IO_STREAM(standby, "Make sure the stream can be put in stanby",

               ASSERT_OK(stream->standby()))  // can not fail



static constexpr auto invalidStateOrNotSupported = {Result::INVALID_STATE, Result::NOT_SUPPORTED};



TEST_IO_STREAM(startNoMmap, "Starting a mmaped stream before mapping it should fail",

               ASSERT_RESULT(invalidStateOrNotSupported, stream->start()))
@@ -1070,11 +1071,15 @@ TEST_P(InputStreamTest, GetInputFramesLost) { 
TEST_P(InputStreamTest, getCapturePosition) {

    doc::test(

        "The capture position of a non prepared stream should not be "

        "retrievable");

        "retrievable or 0");

    uint64_t frames;

    uint64_t time;

    ASSERT_OK(stream->getCapturePosition(returnIn(res, frames, time)));

    ASSERT_RESULT(invalidStateOrNotSupported, res);

    ASSERT_RESULT(okOrInvalidStateOrNotSupported, res);

    if (res == Result::OK) {

        ASSERT_EQ(0U, frames);

        ASSERT_LE(0U, time);

    }

}



TEST_P(InputStreamTest, updateSinkMetadata) {

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3643,6 +3643,7 @@ TEST_F(CameraHidlTest, processCaptureRequestBurstISO) { 
                                        static_cast<int32_t>(PixelFormat::IMPLEMENTATION_DEFINED)};

    uint64_t bufferId = 1;

    uint32_t frameNumber = 1;

    float isoTol = .03f;

    ::android::hardware::hidl_vec<uint8_t> settings;



    for (const auto& name : cameraDeviceNames) {
@@ -3772,7 +3773,8 @@ TEST_F(CameraHidlTest, processCaptureRequestBurstISO) { 
            ASSERT_TRUE(inflightReqs[i].collectedResult.exists(ANDROID_SENSOR_SENSITIVITY));

            camera_metadata_entry_t isoResult = inflightReqs[i].collectedResult.find(

                    ANDROID_SENSOR_SENSITIVITY);

            ASSERT_TRUE(isoResult.data.i32[0] == isoValues[i]);

            ASSERT_TRUE(std::abs(isoResult.data.i32[0] - isoValues[i]) <=

                        std::round(isoValues[i]*isoTol));

        }



        ret = session->close();

compatibility_matrices/compatibility_matrix.3.xml

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ 
    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.power</name>

        <version>1.0-2</version>

        <version>1.0-3</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>