diff options
author | Tao Bao <tbao@google.com> | 2017-08-28 21:52:06 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-28 21:52:06 +0200 |
commit | f351a576ced3fdb5ec516654c522e68dd685a6d2 (patch) | |
tree | d9681631df73a04e432ed88fdf74fcae23ffb1a0 | |
parent | Merge "Add missing report of error code under recovery" (diff) | |
parent | Merge "wear_ui: Remove dead 'self' and 'progress_t'." (diff) | |
download | android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.tar android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.tar.gz android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.tar.bz2 android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.tar.lz android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.tar.xz android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.tar.zst android_bootable_recovery-f351a576ced3fdb5ec516654c522e68dd685a6d2.zip |
-rw-r--r-- | wear_ui.cpp | 8 | ||||
-rw-r--r-- | wear_ui.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 169ef20e1..75d01bdc3 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -18,6 +18,7 @@ #include <errno.h> #include <fcntl.h> +#include <pthread.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -38,11 +39,6 @@ #include "common.h" #include "device.h" -// There's only (at most) one of these objects, and global callbacks -// (for pthread_create, and the input event system) need to find it, -// so use a global variable. -static WearRecoveryUI* self = NULL; - // Return the current time as a double (including fractions of a second). static double now() { struct timeval tv; @@ -63,8 +59,6 @@ WearRecoveryUI::WearRecoveryUI() touch_screen_allowed_ = true; for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL; - - self = this; } int WearRecoveryUI::GetProgressBaseline() const { @@ -68,8 +68,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { const char* const* menu_headers_; int menu_start, menu_end; - pthread_t progress_t; - void draw_background_locked() override; void draw_screen_locked() override; |