commit 5c504ee4cb63b1565a5f5653516d1d31c7d87621
author Chong Zhang <chz@google.com> Thu Jan 21 18:53:19 2021 -0800
committer Chong Zhang <chz@google.com> Thu Jan 21 18:58:33 2021 -0800
tree 8768ce47cbe02877fcaa18da4a02cba774824552
parent 03b68517d3e9d75332b6a2a62b276958807831a5

transcoding: use __ANDROID_API_FUTURE__ in __builtin_available check

__builtin_available 31 fails because we're not officially 31 yet.
Use __ANDROID_API_FUTURE__ for now.

bug: 178144708
test: builds; transcoding unit tests; manually test transcoding works.
Change-Id: I4ccf05f3858feb9e22eb294b4443edc830737204

media/libmediatranscoding/TranscodingUidPolicy.cpp

diff --git a/media/libmediatranscoding/TranscodingUidPolicy.cpp b/media/libmediatranscoding/TranscodingUidPolicy.cpp
index b0fa545..feaecc6 100644
--- a/media/libmediatranscoding/TranscodingUidPolicy.cpp
+++ b/media/libmediatranscoding/TranscodingUidPolicy.cpp
@@ -48,7 +48,7 @@
 }
 
 void TranscodingUidPolicy::registerSelf() {
-    if (__builtin_available(android 31, *)) {
+    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {
         mUidObserver = AActivityManager_addUidImportanceListener(&OnUidImportance, -1, (void*)this);
     }
 
@@ -63,7 +63,7 @@
 }
 
 void TranscodingUidPolicy::unregisterSelf() {
-    if (__builtin_available(android 31, *)) {
+    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {
         AActivityManager_removeUidImportanceListener(mUidObserver);
         mUidObserver = nullptr;
 
@@ -91,7 +91,7 @@
     }
 
     int32_t state = IMPORTANCE_UNKNOWN;
-    if (__builtin_available(android 31, *)) {
+    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {
         if (mRegistered && AActivityManager_isUidActive(uid)) {
             state = AActivityManager_getUidImportance(uid);
         }