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

Commit 89c4d48e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "easy vib. instance name" am: 92f223a9 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2322764



Change-Id: I10c5e0a739cdf0eb6ac40bd3c80e13694c88a6f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9dbaf52a 92f223a9

vibrator/aidl/default/main.cpp

+4 −4
Original line number Diff line number Diff line
@@ -29,15 +29,15 @@ int main() { 


    // make a default vibrator service

    auto vib = ndk::SharedRefBase::make<Vibrator>();

    const std::string vibName = std::string() + Vibrator::descriptor + "/default";

    binder_status_t status = AServiceManager_addService(vib->asBinder().get(), vibName.c_str());

    binder_status_t status = AServiceManager_addService(

            vib->asBinder().get(), Vibrator::makeServiceName("default").c_str());

    CHECK_EQ(status, STATUS_OK);



    // make the vibrator manager service with a different vibrator

    auto managedVib = ndk::SharedRefBase::make<Vibrator>();

    auto vibManager = ndk::SharedRefBase::make<VibratorManager>(std::move(managedVib));

    const std::string vibManagerName = std::string() + VibratorManager::descriptor + "/default";

    status = AServiceManager_addService(vibManager->asBinder().get(), vibManagerName.c_str());

    status = AServiceManager_addService(vibManager->asBinder().get(),

                                        VibratorManager::makeServiceName("default").c_str());

    CHECK_EQ(status, STATUS_OK);



    ABinderProcess_joinThreadPool();