summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2021-01-30 02:32:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-30 02:32:22 +0000
commit3bfb9609e75e67a256704fd5a67a8e96524e783c (patch)
tree524372a5deb48f0facdf33c40f76bcf551c72f2d
parent9548a0cd182dce1926a87a9f80b62e2b60e64426 (diff)
parentb6dd5e5fb5015480d05db38fdb7f2eef1356b73a (diff)
Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 am: 159155defe am: b6dd5e5fb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561315 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I058908ffe0edd8daad3673fc6461c969ab53780c
-rw-r--r--media/native/midi/include/amidi/AMidi.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/media/native/midi/include/amidi/AMidi.h b/media/native/midi/include/amidi/AMidi.h
index 0f930b5443e4..742db34b74a7 100644
--- a/media/native/midi/include/amidi/AMidi.h
+++ b/media/native/midi/include/amidi/AMidi.h
@@ -61,8 +61,6 @@ enum {
AMIDI_DEVICE_TYPE_BLUETOOTH = 3 /* A MIDI device connected via BlueTooth */
};
-#if __ANDROID_API__ >= 29
-
/*
* 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);
-#endif /* __ANDROID_API__ >= 29 */
-
#ifdef __cplusplus
}
#endif