summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-04-09 08:39:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-09 08:39:05 -0700
commit079f09c6ca4148d8e640e34ec03a3eb4fb3507cc (patch)
treebf789fd8321728a7c5e2094c632e3ea522999dab /services
parentd1404465df624a66e9f80b2957bf18624a91df7a (diff)
parent59f482764e346a5c5ac118ee1f7b24da645c2559 (diff)
downloadframeworks_base-079f09c6ca4148d8e640e34ec03a3eb4fb3507cc.zip
frameworks_base-079f09c6ca4148d8e640e34ec03a3eb4fb3507cc.tar.gz
frameworks_base-079f09c6ca4148d8e640e34ec03a3eb4fb3507cc.tar.bz2
Merge "Added support for USB audio devices"
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/WiredAccessoryObserver.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/WiredAccessoryObserver.java b/services/java/com/android/server/WiredAccessoryObserver.java
index 9b4eddc..53d1f0e 100644
--- a/services/java/com/android/server/WiredAccessoryObserver.java
+++ b/services/java/com/android/server/WiredAccessoryObserver.java
@@ -301,13 +301,13 @@ class WiredAccessoryObserver extends UEventObserver {
// Pack up the values and broadcast them to everyone
if (headset == BIT_USB_HEADSET_ANLG) {
- intent = new Intent(Intent.ACTION_USB_ANLG_HEADSET_PLUG);
+ intent = new Intent(Intent.ACTION_ANALOG_AUDIO_DOCK_PLUG);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
intent.putExtra("state", state);
intent.putExtra("name", headsetName);
ActivityManagerNative.broadcastStickyIntent(intent, null);
} else if (headset == BIT_USB_HEADSET_DGTL) {
- intent = new Intent(Intent.ACTION_USB_DGTL_HEADSET_PLUG);
+ intent = new Intent(Intent.ACTION_DIGITAL_AUDIO_DOCK_PLUG);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
intent.putExtra("state", state);
intent.putExtra("name", headsetName);