Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make SoundTriggerHw2Enforcer thread-safe" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-15 03:18:32 +00:00
committed by Android (Google) Code Review
parent 22f4b399ec b933e2cf53
commit 4cb67d23ff
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw2Enforcer.java
View File

@@ -33,7 +33,7 @@ import java.util.Map;
* This is not necessarily a strict enforcement for the HAL contract, but a place to add checks for * This is not necessarily a strict enforcement for the HAL contract, but a place to add checks for
* common HAL malfunctions, to help track them and assist in debugging. * common HAL malfunctions, to help track them and assist in debugging.
* *
* The class is not thread-safe. * The class is thread-safe.
*/ */
public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 { public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 {
static final String TAG = "SoundTriggerHw2Enforcer"; static final String TAG = "SoundTriggerHw2Enforcer";
@@ -55,7 +55,9 @@ public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 {
public int loadSoundModel(ISoundTriggerHw.SoundModel soundModel, Callback callback, public int loadSoundModel(ISoundTriggerHw.SoundModel soundModel, Callback callback,
int cookie) { int cookie) {
int handle = mUnderlying.loadSoundModel(soundModel, new CallbackEnforcer(callback), cookie); int handle = mUnderlying.loadSoundModel(soundModel, new CallbackEnforcer(callback), cookie);
mModelStates.put(handle, false); synchronized (mModelStates) {
mModelStates.put(handle, false);
}
return handle; return handle;
} }
@@ -64,27 +66,35 @@ public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 {
int cookie) { int cookie) {
int handle = mUnderlying.loadPhraseSoundModel(soundModel, new CallbackEnforcer(callback), int handle = mUnderlying.loadPhraseSoundModel(soundModel, new CallbackEnforcer(callback),
cookie); cookie);
mModelStates.put(handle, false); synchronized (mModelStates) {
mModelStates.put(handle, false);
}
return handle; return handle;
} }
@Override @Override
public void unloadSoundModel(int modelHandle) { public void unloadSoundModel(int modelHandle) {
mUnderlying.unloadSoundModel(modelHandle); mUnderlying.unloadSoundModel(modelHandle);
mModelStates.remove(modelHandle); synchronized (mModelStates) {
mModelStates.remove(modelHandle);
}
} }
@Override @Override
public void stopRecognition(int modelHandle) { public void stopRecognition(int modelHandle) {
mUnderlying.stopRecognition(modelHandle); mUnderlying.stopRecognition(modelHandle);
mModelStates.replace(modelHandle, false); synchronized (mModelStates) {
mModelStates.replace(modelHandle, false);
}
} }
@Override @Override
public void stopAllRecognitions() { public void stopAllRecognitions() {
mUnderlying.stopAllRecognitions(); mUnderlying.stopAllRecognitions();
for (Map.Entry<Integer, Boolean> entry : mModelStates.entrySet()) { synchronized (mModelStates) {
entry.setValue(false); for (Map.Entry<Integer, Boolean> entry : mModelStates.entrySet()) {
entry.setValue(false);
}
} }
} }
@@ -92,7 +102,9 @@ public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 {
public void startRecognition(int modelHandle, RecognitionConfig config, Callback callback, public void startRecognition(int modelHandle, RecognitionConfig config, Callback callback,
int cookie) { int cookie) {
mUnderlying.startRecognition(modelHandle, config, new CallbackEnforcer(callback), cookie); mUnderlying.startRecognition(modelHandle, config, new CallbackEnforcer(callback), cookie);
mModelStates.replace(modelHandle, true); synchronized (mModelStates) {
mModelStates.replace(modelHandle, true);
}
} }
@Override @Override
@@ -142,12 +154,14 @@ public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 {
public void recognitionCallback(ISoundTriggerHwCallback.RecognitionEvent event, public void recognitionCallback(ISoundTriggerHwCallback.RecognitionEvent event,
int cookie) { int cookie) {
int model = event.header.model; int model = event.header.model;
if (!mModelStates.getOrDefault(model, false)) { synchronized (mModelStates) {
Log.wtfStack(TAG, "Unexpected recognition event for model: " + model); if (!mModelStates.getOrDefault(model, false)) {
} Log.wtfStack(TAG, "Unexpected recognition event for model: " + model);
if (event.header.status }
!= android.media.soundtrigger_middleware.RecognitionStatus.FORCED) { if (event.header.status
mModelStates.replace(model, false); != android.media.soundtrigger_middleware.RecognitionStatus.FORCED) {
mModelStates.replace(model, false);
}
} }
mUnderlying.recognitionCallback(event, cookie); mUnderlying.recognitionCallback(event, cookie);
} }
@@ -156,12 +170,14 @@ public class SoundTriggerHw2Enforcer implements ISoundTriggerHw2 {
public void phraseRecognitionCallback(ISoundTriggerHwCallback.PhraseRecognitionEvent event, public void phraseRecognitionCallback(ISoundTriggerHwCallback.PhraseRecognitionEvent event,
int cookie) { int cookie) {
int model = event.common.header.model; int model = event.common.header.model;
if (!mModelStates.getOrDefault(model, false)) { synchronized (mModelStates) {
Log.wtfStack(TAG, "Unexpected recognition event for model: " + model); if (!mModelStates.getOrDefault(model, false)) {
} Log.wtfStack(TAG, "Unexpected recognition event for model: " + model);
if (event.common.header.status }
!= android.media.soundtrigger_middleware.RecognitionStatus.FORCED) { if (event.common.header.status
mModelStates.replace(model, false); != android.media.soundtrigger_middleware.RecognitionStatus.FORCED) {
mModelStates.replace(model, false);
}
} }
mUnderlying.phraseRecognitionCallback(event, cookie); mUnderlying.phraseRecognitionCallback(event, cookie);
} }