From 4a8154364473f5775e9d456e5768ee805a8b135d Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 8 Jan 2025 14:14:39 +0800 Subject: [PATCH] Modified branch difference Signed-off-by: li-yaoyao777 --- services/miscdevice_service/include/vibrator_thread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/miscdevice_service/include/vibrator_thread.h b/services/miscdevice_service/include/vibrator_thread.h index b7b0ad4..ec07e5e 100644 --- a/services/miscdevice_service/include/vibrator_thread.h +++ b/services/miscdevice_service/include/vibrator_thread.h @@ -41,8 +41,8 @@ private: int32_t PlayOnce(const VibrateInfo &info); int32_t PlayEffect(const VibrateInfo &info); int32_t PlayCustomByHdHptic(const VibrateInfo &info); - int32_t PlayCustomByCompositeEffect(const VibrateInfo &info); void HandleMultipleVibrations(); + int32_t PlayCustomByCompositeEffect(const VibrateInfo &info); int32_t PlayCompositeEffect(const VibrateInfo &info, const HdfCompositeEffect &hdfCompositeEffect); std::mutex currentVibrationMutex_; VibrateInfo currentVibration_; -- Gitee