commit 9045666047d55134c2e4f0108a88b5799653003e
author Anton Ivanov <aii@google.com> Fri Mar 14 14:56:12 2025 -0700
committer Anton Ivanov <aii@google.com> Mon Mar 17 15:19:12 2025 -0700
tree ed3b00a90cc9ba8d5f71802974ef0b5783f0e55c
parent a4e35c689dbab4ad538da39ddb88aecba83d1abb

Ensure Choreographer is held as sp<> in SurfaceControl.

Test: ChoreographerTests pass
Flag: EXEMPT refactor
Bug: 393217449
Change-Id: I60d42f383d4b73b60de1a7a1bbeec5170b805ebb

libs/gui/SurfaceControl.cpp

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