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

Commit 261ec603 authored by David Lin's avatar David Lin Committed by android-build-merger
Browse files

Merge "Fix issue with double vibration trigger" into oc-dr1-dev am: f34b4633 

am: d9f8a6bd

Change-Id: I496e6162949d0e12093e09f690d19a10e7132351
parents 30879517 d9f8a6bd

services/core/jni/com_android_server_VibratorService.cpp

+6 −4
Original line number Diff line number Diff line
@@ -73,12 +73,14 @@ Return<R> halCall(Return<R> (I::* fn)(Args0...), Args1&&... args1) { 
        ret = (sHal == nullptr) ? NullptrStatus<R>()

                : (*sHal.*fn)(std::forward<Args1>(args1)...);



        if (!ret.isOk()) {

        if (ret.isOk()) {

            break;

        }



        ALOGE("Failed to issue command to vibrator HAL. Retrying.");

        // Restoring connection to the HAL.

        sHal = I::tryGetService();

    }

    }

    return ret;

}