commit ecac1123237c610a1166b1e07b678d259e4d4e71
author Michael Dooley <mdooley@google.com> Fri Sep 28 07:25:12 2018 +0000
committer Michael Dooley <mdooley@google.com> Fri Sep 28 07:25:12 2018 +0000
tree b7a87cba6243c353dc89d246282e8b424c1c3cab
parent 0320d560eaaaaf88ca84dfd6b22b1792904d986c

Revert "Adding getModelState to soundtrigger with build fix."

This reverts commit 0320d560eaaaaf88ca84dfd6b22b1792904d986c.

Reason for revert: broke build

Change-Id: I69cda44f90985b57e69455a8d04cec71f2675831

soundtrigger/2.0/default/SoundTriggerHalImpl.cpp

diff --git a/soundtrigger/2.0/default/SoundTriggerHalImpl.cpp b/soundtrigger/2.0/default/SoundTriggerHalImpl.cpp
index 2de35e8..612772c 100644
--- a/soundtrigger/2.0/default/SoundTriggerHalImpl.cpp
+++ b/soundtrigger/2.0/default/SoundTriggerHalImpl.cpp
@@ -247,7 +247,7 @@
 }
 
 SoundTriggerHalImpl::SoundTriggerHalImpl()
-    : mModuleName("primary"), mNextModelId(1), mHwDevice(NULL) {}
+    : mModuleName("primary"), mHwDevice(NULL), mNextModelId(1) {}
 
 void SoundTriggerHalImpl::onFirstRef() {
     const hw_module_t* mod;

soundtrigger/2.0/default/SoundTriggerHalImpl.h

diff --git a/soundtrigger/2.0/default/SoundTriggerHalImpl.h b/soundtrigger/2.0/default/SoundTriggerHalImpl.h
index fbe24c1..5a9f0e1 100644
--- a/soundtrigger/2.0/default/SoundTriggerHalImpl.h
+++ b/soundtrigger/2.0/default/SoundTriggerHalImpl.h
@@ -167,11 +167,8 @@
     static void recognitionCallback(struct sound_trigger_recognition_event* halEvent, void* cookie);
 
     const char* mModuleName;
-
-    volatile atomic_uint_fast32_t mNextModelId;
-
-   protected:
     struct sound_trigger_hw_device* mHwDevice;
+    volatile atomic_uint_fast32_t mNextModelId;
     DefaultKeyedVector<int32_t, sp<SoundModelClient> > mClients;
     Mutex mLock;
 };