commit 8ed86598b8e5ee2ef1bf1f69e467489e620635e0
author Anton Ivanov <aii@google.com> Thu Feb 20 11:52:50 2025 -0800
committer Anton Ivanov <aii@google.com> Wed Feb 26 10:51:53 2025 -0800
tree aaea52463dcc535ab2a56ad8941c7d21025ef226
parent af9a9ce3f96c6a31684f3b5885722919a1f5ec62

Revert^2 "Harden construction sites of android::StrongPointer."

This reverts commit f73db7a6242e297ead71df0d0d1fb3a8515245d3.

Reason for revert: Scope restricted to sp<>::make which is a safe
replacement for assignment from new.

Bug: 393217449
Test: ChoreographerTests pass locally.
Flag: EXEMPT_refactor

Change-Id: I9a38c54c06cc64da099d282c05ccf20f40b70a72

libs/gui/BufferQueue.cpp

diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index f1374e2..f21ac18 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -125,15 +125,16 @@
     LOG_ALWAYS_FATAL_IF(outConsumer == nullptr,
             "BufferQueue: outConsumer must not be NULL");
 
-    sp<BufferQueueCore> core(new BufferQueueCore());
+    sp<BufferQueueCore> core = sp<BufferQueueCore>::make();
     LOG_ALWAYS_FATAL_IF(core == nullptr,
             "BufferQueue: failed to create BufferQueueCore");
 
-    sp<IGraphicBufferProducer> producer(new BufferQueueProducer(core, consumerIsSurfaceFlinger));
+    sp<IGraphicBufferProducer> producer =
+            sp<BufferQueueProducer>::make(core, consumerIsSurfaceFlinger);
     LOG_ALWAYS_FATAL_IF(producer == nullptr,
             "BufferQueue: failed to create BufferQueueProducer");
 
-    sp<IGraphicBufferConsumer> consumer(new BufferQueueConsumer(core));
+    sp<IGraphicBufferConsumer> consumer = sp<BufferQueueConsumer>::make(core);
     LOG_ALWAYS_FATAL_IF(consumer == nullptr,
             "BufferQueue: failed to create BufferQueueConsumer");