diff options
| author | 2025-04-07 20:04:48 -0700 | |
|---|---|---|
| committer | 2025-04-07 20:04:48 -0700 | |
| commit | 7f83865f6fa01d85f491484242b904ddd354ca1b (patch) | |
| tree | ffb4d203a6fb785c872863b8f81ca61ad17aab35 /libs/gui/SurfaceControl.cpp | |
| parent | c127ba1b5c51e19546dbda092c5d43ffd9559785 (diff) | |
| parent | 02eff543a4f684fe5d7e53efaed469ffc8dbe536 (diff) | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32720584'] into 25Q2-release.
Change-Id: I6bd50ba259eb473edda3846901987acb39bb8f94
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
| -rw-r--r-- | libs/gui/SurfaceControl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |