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
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index ba2d80d..b735418 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -269,11 +269,10 @@
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 @@
if (mBbqChild != nullptr) {
return mBbqChild;
}
- return sp<SurfaceControl>::fromExisting(this);
+ return this;
}
uint64_t SurfaceControl::resolveFrameNumber(const std::optional<uint64_t>& frameNumber) {