| commit | 285af4d7286b3fd0f3859ef2452160441f159029 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Fri Jul 12 22:38:33 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 12 22:38:33 2024 +0000 |
| tree | 38d2a791d2f475de1f51e5bf55bee9225401272d | |
| parent | ecfb0577799ebfcc5201b7adc53c01a656df439c [diff] | |
| parent | 9c94c5c44b7f505125f388c26866b63be9366f65 [diff] |
Merge "libstagefright_aidl_bufferpool2: avoid list<const T>" into main am: 9c94c5c44b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3151178 Change-Id: I7335cc3a5b30710a3dd3c18968488a2b8edb44d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/bufferpool/aidl/default/Accessor.cpp b/media/bufferpool/aidl/default/Accessor.cpp index 423fd84..81e8eac 100644 --- a/media/bufferpool/aidl/default/Accessor.cpp +++ b/media/bufferpool/aidl/default/Accessor.cpp
@@ -444,7 +444,7 @@ std::map<const std::weak_ptr<Accessor>, nsecs_t, std::owner_less<>> &accessors, std::mutex &mutex, std::condition_variable &cv) { - std::list<const std::weak_ptr<Accessor>> evictList; + std::list<std::weak_ptr<Accessor>> evictList; while (true) { int expired = 0; int evicted = 0;