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

Commit 55f124f1 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 am: 5829d86e am: e611be9d

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



Change-Id: Iaec262fc030518450187182754c840a2e1d83c0b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdf5022e e611be9d
Loading
Loading
Loading
Loading
+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