From 0c5fb7e7545040b2540a83ed71120112bd6a6b6a Mon Sep 17 00:00:00 2001
From: Zouberou Sayibou <zouberou@google.com>
Date: Wed, 11 Dec 2024 07:55:29 +0000
Subject: [PATCH] Felix HAL: Move mActiveId_mutex as a private member.

Bug: 379619627
Flag: EXEMPT test only
Test: VibratorHalCs40l26TestSuite
Change-Id: I59298139e68777e37f9f45de9661de59ba34cb83
Signed-off-by: Zouberou Sayibou <zouberou@google.com>
---
 vibrator/cs40l26/Vibrator.cpp | 1 -
 vibrator/cs40l26/Vibrator.h   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/vibrator/cs40l26/Vibrator.cpp b/vibrator/cs40l26/Vibrator.cpp
index 06eba39..787700d 100644
--- a/vibrator/cs40l26/Vibrator.cpp
+++ b/vibrator/cs40l26/Vibrator.cpp
@@ -203,7 +203,6 @@ enum vibe_state {
     VIBE_STATE_ASP,
 };
 
-std::mutex mActiveId_mutex;  // protects mActiveId
 
 class DspMemChunk {
   private:
diff --git a/vibrator/cs40l26/Vibrator.h b/vibrator/cs40l26/Vibrator.h
index eab9461..b8e31de 100644
--- a/vibrator/cs40l26/Vibrator.h
+++ b/vibrator/cs40l26/Vibrator.h
@@ -256,6 +256,7 @@ class Vibrator : public BnVibrator {
     bool mConfigHapticAlsaDeviceDone{false};
     bool mGPIOStatus;
     bool mIsDual{false};
+    std::mutex mActiveId_mutex;  // protects mActiveId
 };
 
 }  // namespace vibrator