| commit | d528a9c36bc4e92d89582e0ba7dbccb1ff6966c9 | [log] [tgz] |
|---|---|---|
| author | Liz Prucka <lizprucka@google.com> | Wed Jul 24 21:22:01 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 24 21:22:01 2024 +0000 |
| tree | 97b754bf51ac9f7602db990589a5c60527066f62 | |
| parent | 9aeb2cbfaa53fc193044cc711655ec44e31d62a5 [diff] | |
| parent | 9001fdf8c15ca1413fd06886bd7c16e337880e51 [diff] |
Merge "Error fix from enabling Clang thread-safety checks." into main am: b310760b09 am: 9001fdf8c1 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3188379 Change-Id: I04d086a19de2d66150daad7b23d53e87953ffbeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/Scheduler/RefreshRateSelector.h b/services/surfaceflinger/Scheduler/RefreshRateSelector.h index 6f9c146..998b1b8 100644 --- a/services/surfaceflinger/Scheduler/RefreshRateSelector.h +++ b/services/surfaceflinger/Scheduler/RefreshRateSelector.h
@@ -321,7 +321,10 @@ RefreshRateSelector(const RefreshRateSelector&) = delete; RefreshRateSelector& operator=(const RefreshRateSelector&) = delete; - const DisplayModes& displayModes() const { return mDisplayModes; } + DisplayModes displayModes() const { + std::lock_guard lock(mLock); + return mDisplayModes; + } // Returns whether switching modes (refresh rate or resolution) is possible. // TODO(b/158780872): Consider HAL support, and skip frame rate detection if the modes only