diff options
author | Tao Bao <tbao@google.com> | 2018-05-29 23:20:24 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-29 23:20:24 +0200 |
commit | 1b55de658e650cd9f29dbd0f040b923ccd129645 (patch) | |
tree | 9e1cd4e38380de9d4def93bea3a35e8b6301d6d6 /screen_ui.h | |
parent | Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992f (diff) | |
parent | Merge "ui: Use std::thread to create input/progress threads." (diff) | |
download | android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.tar android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.tar.gz android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.tar.bz2 android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.tar.lz android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.tar.xz android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.tar.zst android_bootable_recovery-1b55de658e650cd9f29dbd0f040b923ccd129645.zip |
Diffstat (limited to '')
-rw-r--r-- | screen_ui.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/screen_ui.h b/screen_ui.h index c90a2cd17..c3605161a 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -20,9 +20,11 @@ #include <pthread.h> #include <stdio.h> +#include <atomic> #include <functional> #include <memory> #include <string> +#include <thread> #include <vector> #include "ui.h" @@ -112,6 +114,7 @@ class ScreenRecoveryUI : public RecoveryUI { ScreenRecoveryUI(); explicit ScreenRecoveryUI(bool scrollable_menu); + ~ScreenRecoveryUI() override; bool Init(const std::string& locale) override; std::string GetLocale() const override; @@ -275,7 +278,8 @@ class ScreenRecoveryUI : public RecoveryUI { // An alternate text screen, swapped with 'text_' when we're viewing a log file. char** file_viewer_text_; - pthread_t progress_thread_; + std::thread progress_thread_; + std::atomic<bool> progress_thread_stopped_{ false }; // Number of intro frames and loop frames in the animation. size_t intro_frames; |