Merge "Always send KEYCODE_MEDIA_PLAY_PAUSE" (9766afd7) · Commits · e / os / android_packages_modules_Bluetooth

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -2701,12 +2701,8 @@ 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:
		@@ -2729,6 +2725,12 @@ 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: