commit d11bade4e5d7b7818090d775f0bb4dea9d719206
author Ady Abraham <adyabr@google.com> Mon Aug 01 16:18:03 2022 -0700
committer Ady Abraham <adyabr@google.com> Mon Aug 01 16:23:25 2022 -0700
tree fc49aea275d69b819644224dea38d39a1802d1a0
parent c525efb611803c572e2f1154655e1e8fcdfeef30

SF: build with ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION

Change-Id: I347b2cf57f1df426d11d07a84075419597d4a442
Test: presubmit

services/surfaceflinger/HwcSlotGenerator.cpp

diff --git a/services/surfaceflinger/HwcSlotGenerator.cpp b/services/surfaceflinger/HwcSlotGenerator.cpp
index b7e9607..939c35b 100644
--- a/services/surfaceflinger/HwcSlotGenerator.cpp
+++ b/services/surfaceflinger/HwcSlotGenerator.cpp
@@ -56,7 +56,8 @@
         return BufferQueue::INVALID_BUFFER_SLOT;
     }
 
-    ClientCache::getInstance().registerErasedRecipient(clientCacheId, wp<ErasedRecipient>(this));
+    ClientCache::getInstance().registerErasedRecipient(clientCacheId,
+                                                       wp<ErasedRecipient>::fromExisting(this));
 
     int hwcCacheSlot = getFreeHwcCacheSlot();
     mCachedBuffers[clientCacheId] = {hwcCacheSlot, mCounter++};
@@ -85,7 +86,8 @@
     }
     eraseBufferLocked(minClientCacheId);
 
-    ClientCache::getInstance().unregisterErasedRecipient(minClientCacheId, this);
+    ClientCache::getInstance().unregisterErasedRecipient(minClientCacheId,
+                                                         wp<ErasedRecipient>::fromExisting(this));
 }
 
 void HwcSlotGenerator::eraseBufferLocked(const client_cache_t& clientCacheId) REQUIRES(mMutex) {