summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-05-20 21:39:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-20 21:39:23 +0000
commitc0e439f1b7dcd937b6cc842eafc7a4e7c8abce9b (patch)
treed0d3c8974f1c30d3d49c1bc660050244771a80d4 /services
parent53dd1f7ffce9165889a7e0a42e58172c7e7d4dab (diff)
parent948d32748caaac5be06c991ebf00f74265a7849f (diff)
downloadframeworks_base-c0e439f1b7dcd937b6cc842eafc7a4e7c8abce9b.zip
frameworks_base-c0e439f1b7dcd937b6cc842eafc7a4e7c8abce9b.tar.gz
frameworks_base-c0e439f1b7dcd937b6cc842eafc7a4e7c8abce9b.tar.bz2
Merge "AudioSystem: add new audio device definitions"
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/WiredAccessoryManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/WiredAccessoryManager.java b/services/core/java/com/android/server/WiredAccessoryManager.java
index c32beda..cd8c13f 100644
--- a/services/core/java/com/android/server/WiredAccessoryManager.java
+++ b/services/core/java/com/android/server/WiredAccessoryManager.java
@@ -264,7 +264,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
} else if (headset == BIT_USB_HEADSET_DGTL) {
device = AudioManager.DEVICE_OUT_DGTL_DOCK_HEADSET;
} else if (headset == BIT_HDMI_AUDIO) {
- device = AudioManager.DEVICE_OUT_AUX_DIGITAL;
+ device = AudioManager.DEVICE_OUT_HDMI;
} else {
Slog.e(TAG, "setDeviceState() invalid headset type: "+headset);
return;