commit 2fb1d47d09e2d3d0df8526d7c0e06261a409f516
author Ryan Prichard <rprichard@google.com> Thu Jul 19 20:32:19 2018 -0700
committer Ryan Prichard <rprichard@google.com> Thu Aug 23 15:15:31 2018 -0700
tree c22555363fc4628e0fbf417b41b70cec9a7d4540
parent 78e548d575de49701b2050715a3b262a651ec551

Restore __ANDROID_API__ guards for core <android/*> APIs

This commit restores the __ANDROID_API__ guards removed in
"Add __INTRODUCED_IN to core <android/*.h> APIs.",
commit 9db409b053460e065cefb1d1caefe048f90cfff0.

Add a guard to surface_texture.h.

In choreographer.h, declare the types even for older APIs.

Bug: http://b/111668906
Bug: http://b/113052379
Test: builds
Change-Id: Ia013f48a109310f9f8ca6a3211f28fcb69dd602d
(cherry picked from commit 92b1ebea095f9cac70b81ae7382ae69583c9914d)

include/android/choreographer.h

diff --git a/include/android/choreographer.h b/include/android/choreographer.h
index 11f8f6b..d75de1e 100644
--- a/include/android/choreographer.h
+++ b/include/android/choreographer.h
@@ -43,6 +43,8 @@
  */
 typedef void (*AChoreographer_frameCallback)(long frameTimeNanos, void* data);
 
+#if __ANDROID_API__ >= 24
+
 /**
  * Get the AChoreographer instance for the current thread. This must be called
  * on an ALooper thread.
@@ -65,6 +67,8 @@
                 AChoreographer_frameCallback callback, void* data,
                 long delayMillis) __INTRODUCED_IN(24);
 
+#endif /* __ANDROID_API__ >= 24 */
+
 __END_DECLS
 
 #endif // ANDROID_CHOREOGRAPHER_H