From f73db7a6242e297ead71df0d0d1fb3a8515245d3 Mon Sep 17 00:00:00 2001
From: "Priyanka Advani (xWF)" <padvani@google.com>
Date: Wed, 19 Feb 2025 17:35:16 -0800
Subject: 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/LayerState.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 980c969d0d..44aac9bfae 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -691,7 +691,7 @@ void layer_state_t::merge(const layer_state_t& other) {
     }
     if (other.what & eInputInfoChanged) {
         what |= eInputInfoChanged;
-        windowInfoHandle = sp<WindowInfoHandle>::make(*other.windowInfoHandle);
+        windowInfoHandle = new WindowInfoHandle(*other.windowInfoHandle);
     }
     if (other.what & eBackgroundColorChanged) {
         what |= eBackgroundColorChanged;
@@ -1009,13 +1009,13 @@ status_t BufferData::readFromParcel(const Parcel* input) {
     bool tmpBool = false;
     SAFE_PARCEL(input->readBool, &tmpBool);
     if (tmpBool) {
-        buffer = sp<GraphicBuffer>::make();
+        buffer = new GraphicBuffer();
         SAFE_PARCEL(input->read, *buffer);
     }
 
     SAFE_PARCEL(input->readBool, &tmpBool);
     if (tmpBool) {
-        acquireFence = sp<Fence>::make();
+        acquireFence = new Fence();
         SAFE_PARCEL(input->read, *acquireFence);
     }
 
-- 
cgit v1.2.3-59-g8ed1b