Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 am: 159155defe am: b6dd5e5fb5 am: 3bfb9609e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561315 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3dbcb7685ff964e96f0dfdb551e6e9d8cebf069b
This commit is contained in:
@@ -61,8 +61,6 @@ enum {
|
|||||||
AMIDI_DEVICE_TYPE_BLUETOOTH = 3 /* A MIDI device connected via BlueTooth */
|
AMIDI_DEVICE_TYPE_BLUETOOTH = 3 /* A MIDI device connected via BlueTooth */
|
||||||
};
|
};
|
||||||
|
|
||||||
#if __ANDROID_API__ >= 29
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Device API
|
* Device API
|
||||||
*/
|
*/
|
||||||
@@ -249,8 +247,6 @@ media_status_t AMIDI_API AMidiInputPort_sendFlush(const AMidiInputPort *inputPor
|
|||||||
*/
|
*/
|
||||||
void AMIDI_API AMidiInputPort_close(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
|
void AMIDI_API AMidiInputPort_close(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
|
||||||
|
|
||||||
#endif /* __ANDROID_API__ >= 29 */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user