summaryrefslogtreecommitdiffstats
path: root/libs/input
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2015-04-08 10:26:18 -0700
committerTim Kilbourn <tkilbourn@google.com>2015-04-09 10:02:16 -0700
commit063ff53d0b0a0d670ea0185e687526d8fd302820 (patch)
tree3b658ea2501e1bf1ed204570a030288b94d67d10 /libs/input
parent82f393aad651fbf06d8c6872ac10a739ff2a3e42 (diff)
downloadframeworks_native-063ff53d0b0a0d670ea0185e687526d8fd302820.zip
frameworks_native-063ff53d0b0a0d670ea0185e687526d8fd302820.tar.gz
frameworks_native-063ff53d0b0a0d670ea0185e687526d8fd302820.tar.bz2
Pass through availability of audio mic for input devices.
Bug: 15374820 Change-Id: Id2ca6da10165e3a887ebfbb18f663a3bf316ac79
Diffstat (limited to 'libs/input')
-rw-r--r--libs/input/InputDevice.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/libs/input/InputDevice.cpp b/libs/input/InputDevice.cpp
index b11110a..d755ed3 100644
--- a/libs/input/InputDevice.cpp
+++ b/libs/input/InputDevice.cpp
@@ -127,28 +127,31 @@ String8 getInputDeviceConfigurationFilePathByName(
// --- InputDeviceInfo ---
InputDeviceInfo::InputDeviceInfo() {
- initialize(-1, 0, -1, InputDeviceIdentifier(), String8(), false);
+ initialize(-1, 0, -1, InputDeviceIdentifier(), String8(), false, false);
}
InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) :
mId(other.mId), mGeneration(other.mGeneration), mControllerNumber(other.mControllerNumber),
mIdentifier(other.mIdentifier), mAlias(other.mAlias), mIsExternal(other.mIsExternal),
- mSources(other.mSources), mKeyboardType(other.mKeyboardType),
- mKeyCharacterMap(other.mKeyCharacterMap), mHasVibrator(other.mHasVibrator),
- mHasButtonUnderPad(other.mHasButtonUnderPad), mMotionRanges(other.mMotionRanges) {
+ mHasMic(other.mHasMic), mSources(other.mSources),
+ mKeyboardType(other.mKeyboardType), mKeyCharacterMap(other.mKeyCharacterMap),
+ mHasVibrator(other.mHasVibrator), mHasButtonUnderPad(other.mHasButtonUnderPad),
+ mMotionRanges(other.mMotionRanges) {
}
InputDeviceInfo::~InputDeviceInfo() {
}
void InputDeviceInfo::initialize(int32_t id, int32_t generation, int32_t controllerNumber,
- const InputDeviceIdentifier& identifier, const String8& alias, bool isExternal) {
+ const InputDeviceIdentifier& identifier, const String8& alias, bool isExternal,
+ bool hasMic) {
mId = id;
mGeneration = generation;
mControllerNumber = controllerNumber;
mIdentifier = identifier;
mAlias = alias;
mIsExternal = isExternal;
+ mHasMic = hasMic;
mSources = 0;
mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE;
mHasVibrator = false;