do not merge bug 3370834 Cherrypick from master CL 79327
Use input source to determine whether voice reco mode is enabled.
Change-Id: I1efe64904b19575b590ce4b83f44d18b7d064f6b
diff --git a/libaudio-qsd8k/AudioHardware.cpp b/libaudio-qsd8k/AudioHardware.cpp
index f6cfc9d..9773413 100644
--- a/libaudio-qsd8k/AudioHardware.cpp
+++ b/libaudio-qsd8k/AudioHardware.cpp
@@ -36,6 +36,7 @@
#include "AudioHardware.h"
#include <media/AudioRecord.h>
+#include <media/mediarecorder.h>
extern "C" {
#include "msm_audio.h"
@@ -1968,15 +1969,16 @@
AudioParameter param = AudioParameter(keyValuePairs);
status_t status = NO_ERROR;
int device;
- String8 key = String8(KEY_A1026_VR_MODE);
- int enabled;
+ String8 key = String8(AudioParameter::keyInputSource);
+ int source;
LOGV("AudioStreamInMSM72xx::setParameters() %s", keyValuePairs.string());
- // reading voice recognition mode parameter
- if (param.getInt(key, enabled) == NO_ERROR) {
- LOGV("set vr_mode_enabled to %d", enabled);
- vr_mode_change = (vr_mode_enabled != enabled);
- vr_mode_enabled = enabled;
+ // reading input source for voice recognition mode parameter
+ if (param.getInt(key, source) == NO_ERROR) {
+ LOGV("set input source %d", source);
+ int uses_vr = (source == AUDIO_SOURCE_VOICE_RECOGNITION);
+ vr_mode_change = (vr_mode_enabled != uses_vr);
+ vr_mode_enabled = uses_vr;
param.remove(key);
}
diff --git a/libaudio-qsd8k/AudioHardware.h b/libaudio-qsd8k/AudioHardware.h
index a911a97..e961ede 100644
--- a/libaudio-qsd8k/AudioHardware.h
+++ b/libaudio-qsd8k/AudioHardware.h
@@ -103,8 +103,6 @@
#define RX_IIR_ENABLE 0x0004
#define RX_IIR_DISABLE 0x0000
-#define KEY_A1026_VR_MODE "vr_mode"
-
#define MOD_PLAY 1
#define MOD_REC 2
