diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-12-03 13:39:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-03 13:39:26 +0000 |
| commit | 0927c43c38c2ef12e8b15490adf0d5d3796c39b7 (patch) | |
| tree | 111548d4db0aeafae2adb0c86726249a74aee063 | |
| parent | 4fb972207ab04eee8ee44720e91044d1cee157be (diff) | |
| parent | 008dfadb31f58efbd7bd99b3d3e5d6ee21d68c05 (diff) | |
| download | frameworks_base-0927c43c38c2ef12e8b15490adf0d5d3796c39b7.zip frameworks_base-0927c43c38c2ef12e8b15490adf0d5d3796c39b7.tar.gz frameworks_base-0927c43c38c2ef12e8b15490adf0d5d3796c39b7.tar.bz2 | |
Merge "Remove obsolete AudioManager audio dock plugged Intents"
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 30 | ||||
| -rw-r--r-- | media/java/android/media/AudioService.java | 6 |
3 files changed, 0 insertions, 38 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 003ec64..bdf5771 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -182,8 +182,6 @@ <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" /> <protected-broadcast android:name="android.intent.action.HEADSET_PLUG" /> - <protected-broadcast android:name="android.media.action.ANALOG_AUDIO_DOCK_PLUG" /> - <protected-broadcast android:name="android.media.action.DIGITAL_AUDIO_DOCK_PLUG" /> <protected-broadcast android:name="android.media.action.HDMI_AUDIO_PLUG" /> <protected-broadcast android:name="android.media.action.USB_AUDIO_ACCESSORY_PLUG" /> <protected-broadcast android:name="android.media.action.USB_AUDIO_DEVICE_PLUG" /> diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 543836b..f08bbbc 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -278,36 +278,6 @@ public class AudioManager { public static final String EXTRA_ENCODINGS = "android.media.extra.ENCODINGS"; /** - * Broadcast Action: An analog audio speaker/headset plugged in or unplugged. - * - * <p>The intent will have the following extra values: - * <ul> - * <li><em>state</em> - 0 for unplugged, 1 for plugged. </li> - * <li><em>name</em> - Headset type, human readable string </li> - * </ul> - * </ul> - * @hide - */ - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_ANALOG_AUDIO_DOCK_PLUG = - "android.media.action.ANALOG_AUDIO_DOCK_PLUG"; - - /** - * Broadcast Action: A digital audio speaker/headset plugged in or unplugged. - * - * <p>The intent will have the following extra values: - * <ul> - * <li><em>state</em> - 0 for unplugged, 1 for plugged. </li> - * <li><em>name</em> - Headset type, human readable string </li> - * </ul> - * </ul> - * @hide - */ - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_DIGITAL_AUDIO_DOCK_PLUG = - "android.media.action.DIGITAL_AUDIO_DOCK_PLUG"; - - /** * Broadcast Action: A USB audio accessory was plugged in or unplugged. * * <p>The intent will have the following extra values: diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 9a3ec42..16fbd06 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -4691,12 +4691,6 @@ public class AudioService extends IAudioService.Stub { connType = AudioRoutesInfo.MAIN_HEADPHONES; intent.setAction(Intent.ACTION_HEADSET_PLUG); intent.putExtra("microphone", 0); - } else if (device == AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET) { - connType = AudioRoutesInfo.MAIN_DOCK_SPEAKERS; - intent.setAction(AudioManager.ACTION_ANALOG_AUDIO_DOCK_PLUG); - } else if (device == AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET) { - connType = AudioRoutesInfo.MAIN_DOCK_SPEAKERS; - intent.setAction(AudioManager.ACTION_DIGITAL_AUDIO_DOCK_PLUG); } else if (device == AudioSystem.DEVICE_OUT_HDMI) { connType = AudioRoutesInfo.MAIN_HDMI; configureHdmiPlugIntent(intent, state); |