PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wear_ui: Remove dead 'self' and 'progress_t'."

Browse Source
This commit is contained in:
Tao Bao
2017-08-28 19:41:54 +00:00
committed by Gerrit Code Review
parent 571855b0e6 cff8269e5c
commit 2e125bec2f
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wear_ui.cpp
+1 -7
View File
@@ -18,6 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pthread.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -38,11 +39,6 @@
#include "common.h" #include "common.h"
#include "device.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). // Return the current time as a double (including fractions of a second).
static double now() { static double now() {
struct timeval tv; struct timeval tv;
@@ -63,8 +59,6 @@ WearRecoveryUI::WearRecoveryUI()
touch_screen_allowed_ = true; touch_screen_allowed_ = true;
for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL; for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL;
self = this;
} }
int WearRecoveryUI::GetProgressBaseline() const { int WearRecoveryUI::GetProgressBaseline() const {
wear_ui.h
-2
View File
@@ -68,8 +68,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
const char* const* menu_headers_; const char* const* menu_headers_;
int menu_start, menu_end; int menu_start, menu_end;
pthread_t progress_t;
void draw_background_locked() override; void draw_background_locked() override;
void draw_screen_locked() override; void draw_screen_locked() override;