commit f73db7a6242e297ead71df0d0d1fb3a8515245d3
author Priyanka Advani (xWF) <padvani@google.com> Wed Feb 19 17:35:16 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 17:35:16 2025 -0800
tree d8b75648a2c39694a22e13dec94ac10344ca11ec
parent 81793808b9347a52dd979e4b3d5d9d10fc8c4915

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

This reverts commit 81793808b9347a52dd979e4b3d5d9d10fc8c4915.

Reason for revert: Droidmonitor created revert due to b/397788382. Will be verifying through ABTD before submission.

Change-Id: Idd58b82a5a5380053cdff4e7b92eafa66b2c2782

libs/gui/ScreenCaptureResults.cpp

diff --git a/libs/gui/ScreenCaptureResults.cpp b/libs/gui/ScreenCaptureResults.cpp
index 0c9d6d6..2de023e 100644
--- a/libs/gui/ScreenCaptureResults.cpp
+++ b/libs/gui/ScreenCaptureResults.cpp
@@ -18,7 +18,6 @@
 
 #include <private/gui/ParcelUtils.h>
 #include <ui/FenceResult.h>
-#include "ui/GraphicBuffer.h"
 
 namespace android::gui {
 
@@ -55,7 +54,7 @@
     bool hasGraphicBuffer;
     SAFE_PARCEL(parcel->readBool, &hasGraphicBuffer);
     if (hasGraphicBuffer) {
-        buffer = sp<GraphicBuffer>::make();
+        buffer = new GraphicBuffer();
         SAFE_PARCEL(parcel->read, *buffer);
     }
 
@@ -80,7 +79,7 @@
     bool hasGainmap;
     SAFE_PARCEL(parcel->readBool, &hasGainmap);
     if (hasGainmap) {
-        optionalGainMap = sp<GraphicBuffer>::make();
+        optionalGainMap = new GraphicBuffer();
         SAFE_PARCEL(parcel->read, *optionalGainMap);
     }
     SAFE_PARCEL(parcel->readFloat, &hdrSdrRatio);