Snap for 13097162 from ee4497116b560289f1ad95bae733f707a25a129a to 25Q2-release

Change-Id: Iff8ef6cb85edfbfe64bbff67fd27e5c7241d5444

1 files changed, 5 insertions, 6 deletions

diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index ba2d80d1b3..b735418d4b 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -269,11 +269,10 @@ status_t SurfaceControl::readFromParcel(const Parcel& parcel,
     SAFE_PARCEL(parcel.readUint32, &format);
 
     // We aren't the original owner of the surface.
-    *outSurfaceControl =
-            sp<SurfaceControl>::make(sp<SurfaceComposerClient>::make(
-                                             interface_cast<ISurfaceComposerClient>(client)),
-                                     handle, layerId, layerName, width, height, format,
-                                     transformHint);
+    *outSurfaceControl = new SurfaceControl(new SurfaceComposerClient(
+                                                    interface_cast<ISurfaceComposerClient>(client)),
+                                            handle.get(), layerId, layerName, width, height, format,
+                                            transformHint);
 
     return NO_ERROR;
 }
@@ -304,7 +303,7 @@ sp<SurfaceControl> SurfaceControl::getParentingLayer() {
     if (mBbqChild != nullptr) {
         return mBbqChild;
     }
-    return sp<SurfaceControl>::fromExisting(this);
+    return this;
 }
 
 uint64_t SurfaceControl::resolveFrameNumber(const std::optional<uint64_t>& frameNumber) {