From 8ed86598b8e5ee2ef1bf1f69e467489e620635e0 Mon Sep 17 00:00:00 2001
From: Anton Ivanov <aii@google.com>
Date: Thu, 20 Feb 2025 11:52:50 -0800
Subject: 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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libs/gui/BufferQueue.cpp')

diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index f1374e23fd..f21ac18f3c 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -125,15 +125,16 @@ void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,
     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");
 
-- 
cgit v1.2.3-59-g8ed1b