Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce
am: 813120749d
Change-Id: I8a52750375fd46b43b8135d75fe1dd3940c8a36c
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 169ef20..75d01bd 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 @@
touch_screen_allowed_ = true;
for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL;
-
- self = this;
}
int WearRecoveryUI::GetProgressBaseline() const {
diff --git a/wear_ui.h b/wear_ui.h
index 3bd90b6..d04718c 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -68,8 +68,6 @@
const char* const* menu_headers_;
int menu_start, menu_end;
- pthread_t progress_t;
-
void draw_background_locked() override;
void draw_screen_locked() override;