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

am: f34b4633bd

Change-Id: Iaa872f5a6990f01dd832f48c88a3fc4625a89063
This commit is contained in:
David Lin
2017-07-13 23:20:48 +00:00
committed by android-build-merger

View File

@@ -73,11 +73,13 @@ Return<R> halCall(Return<R> (I::* fn)(Args0...), Args1&&... args1) {
ret = (sHal == nullptr) ? NullptrStatus<R>()
: (*sHal.*fn)(std::forward<Args1>(args1)...);
if (!ret.isOk()) {
ALOGE("Failed to issue command to vibrator HAL. Retrying.");
// Restoring connection to the HAL.
sHal = I::tryGetService();
if (ret.isOk()) {
break;
}
ALOGE("Failed to issue command to vibrator HAL. Retrying.");
// Restoring connection to the HAL.
sHal = I::tryGetService();
}
return ret;
}