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

Commit 035ee7b9 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge TP1A.220624.013 

Merged-In: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
Change-Id: Iabfc2e451749cbfe858e7bca6492565bf020d878
parents 3034ecf2 ad2871f7

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1719,10 +1719,10 @@ TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) { 
            }

        }



        configureLayer(display, layer, Composition::DISPLAY_DECORATION, display.getFrameRect(),

                          display.getCrop());

        mWriter.setLayerBuffer(display.getDisplayId(), layer, /*slot*/ 0, decorBuffer->handle,

                               /*acquireFence*/ -1);

        mWriter.setLayerCompositionType(display.getDisplayId(), layer,

                                        Composition::DISPLAY_DECORATION);

        mWriter.validateDisplay(display.getDisplayId(), ComposerClientWriter::kNoTimestamp);

        execute();

        if (support) {

media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp

+10 −1
Original line number Diff line number Diff line
@@ -399,12 +399,21 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) { 
                    ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)

                            << " Component: " << info.mName.c_str() << " Role: " << role.c_str()

                            << " not allowed for devices launching with Android T and above";

                } else {

                    std::string codecName = info.mName;

                    bool isAndroidCodec = (codecName.rfind("OMX.google", 0) != std::string::npos);

                    if (isAndroidCodec && (getFirstApiLevel() <= __ANDROID_API_S__)) {

                        // refer b/230582620

                        // S AOSP build did not remove the OMX.google video codecs

                        // so it is infeasible to require no OMX.google.* video codecs

                        // on S launching devices

                    } else {

                        ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)

                            << " Component: " << info.mName.c_str() << " Role: " << role.c_str()

                            << " not allowed for devices launching with Android S and above";

                    }

                }

            }

            if (role.find("audio_decoder") != std::string::npos ||

                role.find("audio_encoder") != std::string::npos) {

                ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)