diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-05-30 03:34:12 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-30 03:34:12 +0200 |
| commit | 956580b139a9ab5bb3feabbd44103be4232ed19e (patch) | |
| tree | d2b73f358915b68479535a2956639c4688552297 /wear_ui.cpp | |
| parent | Merge "ui: Use std::thread to create input/progress threads." (diff) | |
| parent | Merge "recovery: c++ify pthread use in UI" (diff) | |
| download | android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.tar android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.tar.gz android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.tar.bz2 android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.tar.lz android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.tar.xz android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.tar.zst android_bootable_recovery-956580b139a9ab5bb3feabbd44103be4232ed19e.zip | |
Diffstat (limited to 'wear_ui.cpp')
| -rw-r--r-- | wear_ui.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index f4a839923..65c4aeed6 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -16,7 +16,6 @@ #include "wear_ui.h" -#include <pthread.h> #include <string.h> #include <string> @@ -86,11 +85,10 @@ void WearRecoveryUI::SetStage(int /* current */, int /* max */) {} void WearRecoveryUI::StartMenu(const std::vector<std::string>& headers, const std::vector<std::string>& items, size_t initial_selection) { - pthread_mutex_lock(&updateMutex); + std::lock_guard<std::mutex> lg(updateMutex); if (text_rows_ > 0 && text_cols_ > 0) { menu_ = std::make_unique<Menu>(scrollable_menu_, text_rows_ - kMenuUnusableRows - 1, text_cols_ - 1, headers, items, initial_selection); update_screen_locked(); } - pthread_mutex_unlock(&updateMutex); } |