| commit | 5a1f7fdceb747e4275ea9558d9b1f89189006c7c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jun 18 03:05:14 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 18 03:05:14 2024 +0000 |
| tree | 9e39a1424471ab0a0d056afd01ecc91f3dc9cce8 | |
| parent | baa25f16d74e211bcd6cc8db0d51bf00ec4c202b [diff] | |
| parent | e70d4bdebb50e362991b72d77b7a003930cf468c [diff] |
Merge "libui: use __ANDROID_API_V__" into main am: e70d4bdebb Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3133734 Change-Id: I780e23adac3b4ed0aea79495d3d20f0f009b8f0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 {