Skip to content

Commit 2f39e9f

Browse files
author
Craig Mautner
committed
Switch from uevent model to /dev/input/event.
Headsets are now detected from calls coming in from the input switch subsystem if a config.xml value is set to true. Bug: 6548391. Change-Id: I79259d2742e157b106a746474f32ffd1c171ddf3
1 parent a995b6e commit 2f39e9f

File tree

6 files changed

+492
-331
lines changed

6 files changed

+492
-331
lines changed

core/res/res/values/config.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,4 +960,8 @@
960960
-->
961961
<bool name="config_enableWifiDisplay">false</bool>
962962

963+
<!-- When true use the linux /dev/input/event subsystem to detect the switch changes
964+
on the headphone/microphone jack. When false use the older uevent framework. -->
965+
<bool name="config_useDevInputEventForAudioJack">false</bool>
966+
963967
</resources>

core/res/res/values/symbols.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@
271271
<java-symbol type="bool" name="config_enableScreenshotChord" />
272272
<java-symbol type="bool" name="config_bluetooth_default_profiles" />
273273
<java-symbol type="bool" name="config_enableWifiDisplay" />
274-
274+
<java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
275+
275276
<java-symbol type="integer" name="config_cursorWindowSize" />
276277
<java-symbol type="integer" name="config_longPressOnPowerBehavior" />
277278
<java-symbol type="integer" name="config_max_pan_devices" />

services/java/com/android/server/SystemServer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,11 +631,12 @@ public void run() {
631631
}
632632

633633
try {
634-
Slog.i(TAG, "Wired Accessory Observer");
634+
Slog.i(TAG, "Wired Accessory Manager");
635635
// Listen for wired headset changes
636-
new WiredAccessoryObserver(context);
636+
inputManager.setWiredAccessoryCallbacks(
637+
new WiredAccessoryManager(context, inputManager));
637638
} catch (Throwable e) {
638-
reportWtf("starting WiredAccessoryObserver", e);
639+
reportWtf("starting WiredAccessoryManager", e);
639640
}
640641

641642
try {

0 commit comments

Comments
 (0)