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

Commit 5829d86e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk_unit_test: fix after light install" into main am:... 

Merge "libbinder_ndk_unit_test: fix after light install" into main am: 9a7f6c17 am: 0e361267 am: 248c6c28

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2755747



Change-Id: I822ebc05c567c8f20912d95f3cb5c2bc562a1347
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04c0922f 248c6c28

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ TEST(NdkBinder, GetLazyService) { 


TEST(NdkBinder, IsUpdatable) {

    bool isUpdatable = AServiceManager_isUpdatableViaApex("android.hardware.light.ILights/default");

    EXPECT_EQ(isUpdatable, false);

    EXPECT_EQ(isUpdatable, true);

}



TEST(NdkBinder, GetUpdatableViaApex) {
@@ -445,7 +445,7 @@ TEST(NdkBinder, GetUpdatableViaApex) { 
            [](const char* apexName, void* context) {

                *static_cast<std::optional<std::string>*>(context) = apexName;

            });

    EXPECT_EQ(updatableViaApex, std::nullopt) << *updatableViaApex;

    EXPECT_NE(updatableViaApex, std::nullopt) << *updatableViaApex;

}



// This is too slow