From 02eff543a4f684fe5d7e53efaed469ffc8dbe536 Mon Sep 17 00:00:00 2001
From: Anton Ivanov <aii@google.com>
Date: Wed, 26 Mar 2025 17:24:45 -0700
Subject: Revert "Ensure Choreographer is held as sp<> in SurfaceControl."

This reverts commit 9045666047d55134c2e4f0108a88b5799653003e.

Reason for revert: Supsected cause for b/405669080
Test: presubmit
Flag: EXEMPT refactor
Bug: 405669080
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ade9b0ca6046beae913335000cdd398ac4381bb9)
Merged-In: I96c45abfe8446c924e9ea31f822e040134e87db9
Change-Id: I96c45abfe8446c924e9ea31f822e040134e87db9
---
 libs/gui/SurfaceControl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index 50877f8c56..1eb9b87c3c 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -194,7 +194,7 @@ const std::string& SurfaceControl::getName() const {
     return mName;
 }
 
-sp<Choreographer> SurfaceControl::getChoreographer() {
+std::shared_ptr<Choreographer> SurfaceControl::getChoreographer() {
     if (mChoreographer) {
         return mChoreographer;
     }
@@ -203,7 +203,7 @@ sp<Choreographer> SurfaceControl::getChoreographer() {
         ALOGE("%s: No looper prepared for thread", __func__);
         return nullptr;
     }
-    mChoreographer = sp<Choreographer>::make(looper, getHandle());
+    mChoreographer = std::make_shared<Choreographer>(looper, getHandle());
     status_t result = mChoreographer->initialize();
     if (result != OK) {
         ALOGE("Failed to initialize choreographer");
-- 
cgit v1.2.3-59-g8ed1b