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

Commit 4843659a authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

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

Merge "libbinder_ndk_unit_test: disable after light install" into main am: 748848b7 am: 565fa51b am: 27ace0d2

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



Change-Id: Ibed8c699a34c301f5f7769558669babe259ba08a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5829d86e 27ace0d2

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+15 −14
Original line number Diff line number Diff line
@@ -433,20 +433,21 @@ TEST(NdkBinder, GetLazyService) { 
    EXPECT_EQ(STATUS_OK, AIBinder_ping(binder.get()));

}



TEST(NdkBinder, IsUpdatable) {

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

    EXPECT_EQ(isUpdatable, true);

}



TEST(NdkBinder, GetUpdatableViaApex) {

    std::optional<std::string> updatableViaApex;

    AServiceManager_getUpdatableApexName(

            "android.hardware.light.ILights/default", &updatableViaApex,

            [](const char* apexName, void* context) {

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

            });

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

}

// TEST(NdkBinder, IsUpdatable) {

//     bool isUpdatable =

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

//     EXPECT_EQ(isUpdatable, true);

// }

//

// TEST(NdkBinder, GetUpdatableViaApex) {

//     std::optional<std::string> updatableViaApex;

//     AServiceManager_getUpdatableApexName(

//             "android.hardware.light.ILights/default", &updatableViaApex,

//             [](const char* apexName, void* context) {

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

//             });

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

// }



// This is too slow

TEST(NdkBinder, CheckLazyServiceShutDown) {