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
This commit is contained in:
Prashant Malani
2016-03-10 14:51:25 -08:00
parent d345de66ef
commit 0ba21cff07
4 changed files with 6 additions and 18 deletions
+2 -2
View File
@@ -54,7 +54,6 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
currentIcon(NONE),
installingFrame(0),
locale(nullptr),
rtl_locale(false),
progressBarType(EMPTY),
progressScopeStart(0),
progressScopeSize(0),
@@ -76,7 +75,8 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
animation_fps(-1),
installing_frames(-1),
stage(-1),
max_stage(-1) {
max_stage(-1),
rtl_locale(false) {
for (int i = 0; i < 5; i++) {
backgroundIcon[i] = nullptr;