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 /screen_ui.h | |
| 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 'screen_ui.h')
| -rw-r--r-- | screen_ui.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/screen_ui.h b/screen_ui.h index c3605161a..b76d4706e 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -17,7 +17,6 @@ #ifndef RECOVERY_SCREEN_UI_H #define RECOVERY_SCREEN_UI_H -#include <pthread.h> #include <stdio.h> #include <atomic> @@ -192,7 +191,6 @@ class ScreenRecoveryUI : public RecoveryUI { GRSurface* GetCurrentFrame() const; GRSurface* GetCurrentText() const; - static void* ProgressThreadStartRoutine(void* data); void ProgressThreadLoop(); virtual void ShowFile(FILE*); @@ -297,7 +295,7 @@ class ScreenRecoveryUI : public RecoveryUI { std::string locale_; bool rtl_locale_; - pthread_mutex_t updateMutex; + std::mutex updateMutex; private: void SetLocale(const std::string&); |