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/BLASTBufferQueue.cpp

diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 340b84c..fa97142 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -637,7 +637,8 @@
                            bufferItem.mScalingMode, crop);
 
     auto releaseBufferCallback = makeReleaseBufferCallbackThunk();
-    sp<Fence> fence = bufferItem.mFence ? new Fence(bufferItem.mFence->dup()) : Fence::NO_FENCE;
+    sp<Fence> fence =
+            bufferItem.mFence ? sp<Fence>::make(bufferItem.mFence->dup()) : Fence::NO_FENCE;
 
     nsecs_t dequeueTime = -1;
     {
@@ -1014,7 +1015,7 @@
     if (includeSurfaceControlHandle && mSurfaceControl) {
         scHandle = mSurfaceControl->getHandle();
     }
-    return new BBQSurface(mProducer, true, scHandle, this);
+    return sp<BBQSurface>::make(mProducer, true, scHandle, this);
 }
 
 void BLASTBufferQueue::mergeWithNextTransaction(SurfaceComposerClient::Transaction* t,