From 0ba21cff07ceafeaa43e17aa26e341d961f6f29f Mon Sep 17 00:00:00 2001
From: Prashant Malani
Date: Thu, 10 Mar 2016 14:51:25 -0800
Subject: 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
---
 wear_ui.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'wear_ui.cpp')

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() :
     currentIcon(NONE),
     intro_done(false),
     current_frame(0),
-    rtl_locale(false),
     progressBarType(EMPTY),
     progressScopeStart(0),
     progressScopeSize(0),
@@ -81,7 +80,6 @@ WearRecoveryUI::WearRecoveryUI() :
     for (size_t i = 0; i < 5; i++)
         backgroundIcon[i] = NULL;
 
-    pthread_mutex_init(&updateMutex, NULL);
     self = this;
 }
 
@@ -321,13 +319,6 @@ void WearRecoveryUI::progress_loop() {
     }
 }
 
-void WearRecoveryUI::LoadBitmap(const char* filename, GRSurface** surface) {
-    int result = res_create_display_surface(filename, surface);
-    if (result < 0) {
-        LOGE("missing bitmap %s\n(Code %d)\n", filename, result);
-    }
-}
-
 void WearRecoveryUI::Init()
 {
     gr_init();
-- 
cgit v1.2.3-54-g00ecf