Merge "Fix C compatibility in AMidi.h." into tm-dev-plus-aosp am: d34388f8fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441167

Change-Id: I86df4b675ff5799ccfdf0e0b5d2d2e7d7f331067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-01 23:09:23 +00:00
committed by Automerger Merge Worker

View File

@@ -66,7 +66,7 @@ enum {
* *
* Introduced in API 33. * Introduced in API 33.
*/ */
enum AMidiDevice_Protocol : int32_t { typedef enum AMidiDevice_Protocol : int32_t {
/** /**
* Constant representing a default protocol with Universal MIDI Packets (UMP). * Constant representing a default protocol with Universal MIDI Packets (UMP).
* UMP is defined in "Universal MIDI Packet (UMP) Format and MIDI 2.0 Protocol" spec. * UMP is defined in "Universal MIDI Packet (UMP) Format and MIDI 2.0 Protocol" spec.
@@ -131,7 +131,7 @@ enum AMidiDevice_Protocol : int32_t {
* MIDI-CI is defined in "MIDI Capability Inquiry (MIDI-CI)" spec. * MIDI-CI is defined in "MIDI Capability Inquiry (MIDI-CI)" spec.
*/ */
AMIDI_DEVICE_PROTOCOL_UNKNOWN = -1 AMIDI_DEVICE_PROTOCOL_UNKNOWN = -1
}; } AMidiDevice_Protocol;
/* /*
* Device API * Device API