Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb003312 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Revert "Always send KEYCODE_MEDIA_PLAY_PAUSE"" 

am: 12391b29

Change-Id: Ib3b6a74304f7f1df16a96deb0a9b8357d05710f6
parents 36638d54 12391b29

android/app/src/com/android/bluetooth/avrcp/Avrcp.java

+4 −6
Original line number Diff line number Diff line
@@ -2716,8 +2716,12 @@ public final class Avrcp { 
                return KeyEvent.KEYCODE_VOLUME_DOWN;

            case BluetoothAvrcp.PASSTHROUGH_ID_MUTE:

                return KeyEvent.KEYCODE_MUTE;

            case BluetoothAvrcp.PASSTHROUGH_ID_PLAY:

                return KeyEvent.KEYCODE_MEDIA_PLAY;

            case BluetoothAvrcp.PASSTHROUGH_ID_STOP:

                return KeyEvent.KEYCODE_MEDIA_STOP;

            case BluetoothAvrcp.PASSTHROUGH_ID_PAUSE:

                return KeyEvent.KEYCODE_MEDIA_PAUSE;

            case BluetoothAvrcp.PASSTHROUGH_ID_RECORD:

                return KeyEvent.KEYCODE_MEDIA_RECORD;

            case BluetoothAvrcp.PASSTHROUGH_ID_REWIND:
@@ -2740,12 +2744,6 @@ public final class Avrcp { 
                return KeyEvent.KEYCODE_F4;

            case BluetoothAvrcp.PASSTHROUGH_ID_F5:

                return KeyEvent.KEYCODE_F5;

            // Interop workaround for headphones/car kits

            // which do not properly key track of playback

            // state...

            case BluetoothAvrcp.PASSTHROUGH_ID_PLAY:

            case BluetoothAvrcp.PASSTHROUGH_ID_PAUSE:

                return KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE;

            // Fallthrough for all unknown key mappings

            case BluetoothAvrcp.PASSTHROUGH_ID_SELECT:

            case BluetoothAvrcp.PASSTHROUGH_ID_ROOT_MENU: