aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Malani2016-03-10 16:51:25 -0600
committerPrashant Malani2016-03-10 17:36:31 -0600
commit0ba21cff07ceafeaa43e17aa26e341d961f6f29f (patch)
tree952df7e80dff00b8ad1d091d8a4bf65e31d16c88 /wear_ui.cpp
parentd345de66efb919e8c0d09ee5b4d8ae0d443d6c94 (diff)
downloadplatform-bootable-recovery-0ba21cff07ceafeaa43e17aa26e341d961f6f29f.tar.gz
platform-bootable-recovery-0ba21cff07ceafeaa43e17aa26e341d961f6f29f.tar.xz
platform-bootable-recovery-0ba21cff07ceafeaa43e17aa26e341d961f6f29f.zip
recovery: Remove duplicate variables and functions
The function that modifies rtl_locale exists only in the base class, and so the variable should not have a duplicate in the derived class, otherwise there may be incosistent values when it is read by the derived class (the thinking being that invoking the function will modify the base class version of the variable, and not the derived class version). Remove the updateMutex variable, and instead re-use the one in the base class. Also remove LoadBitmap from WearUI since it is identical to the one in ScreenRecoveryUI. Bug: 27407422 Change-Id: Idd823fa93dfa16d7b2c9c7160f8d0c2559d28731
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r--wear_ui.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 65bcd849..e76af8d6 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -62,7 +62,6 @@ WearRecoveryUI::WearRecoveryUI() :
62 currentIcon(NONE), 62 currentIcon(NONE),
63 intro_done(false), 63 intro_done(false),
64 current_frame(0), 64 current_frame(0),
65 rtl_locale(false),
66 progressBarType(EMPTY), 65 progressBarType(EMPTY),
67 progressScopeStart(0), 66 progressScopeStart(0),
68 progressScopeSize(0), 67 progressScopeSize(0),
@@ -81,7 +80,6 @@ WearRecoveryUI::WearRecoveryUI() :
81 for (size_t i = 0; i < 5; i++) 80 for (size_t i = 0; i < 5; i++)
82 backgroundIcon[i] = NULL; 81 backgroundIcon[i] = NULL;
83 82
84 pthread_mutex_init(&updateMutex, NULL);
85 self = this; 83 self = this;
86} 84}
87 85
@@ -321,13 +319,6 @@ void WearRecoveryUI::progress_loop() {
321 } 319 }
322} 320}
323 321
324void WearRecoveryUI::LoadBitmap(const char* filename, GRSurface** surface) {
325 int result = res_create_display_surface(filename, surface);
326 if (result < 0) {
327 LOGE("missing bitmap %s\n(Code %d)\n", filename, result);
328 }
329}
330
331void WearRecoveryUI::Init() 322void WearRecoveryUI::Init()
332{ 323{
333 gr_init(); 324 gr_init();