commit e70d4bdebb50e362991b72d77b7a003930cf468c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jun 18 02:39:12 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 18 02:39:12 2024 +0000
tree 9e39a1424471ab0a0d056afd01ecc91f3dc9cce8
parent 9b1356c1390ca036fb3058afa024e6f69ea76a5c
parent 4f61be28eaf5297057b2c4f9b65b47018655bbb1

Merge "libui: use __ANDROID_API_V__" into main

libs/ui/Gralloc5.cpp

diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp
index f14a5cf..c9ec036 100644
--- a/libs/ui/Gralloc5.cpp
+++ b/libs/ui/Gralloc5.cpp
@@ -91,8 +91,7 @@
         }
 
         void* so = nullptr;
-        // TODO(b/322384429) switch this to __ANDROID_API_V__ when V is finalized
-        if API_LEVEL_AT_LEAST(__ANDROID_API_FUTURE__, 202404) {
+        if API_LEVEL_AT_LEAST (__ANDROID_API_V__, 202404) {
             so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(),
                                                             RTLD_LOCAL | RTLD_NOW);
         } else {