Revert "recovery: More refactoring of WearUI"
This reverts commit 1c7b2230d8aac9f064f68c48b6aa26aca000cc9d.
This change can lead to the derived class indirectly (and incorrectly) calling some functions from the base class, which can lead to unpredictable behavior.
Bug: 27407422
Change-Id: I126a7489b0787dc195e942e2ceea6769de20d70c
diff --git a/screen_ui.cpp b/screen_ui.cpp
index dc59631..522aa6b 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -51,6 +51,7 @@
}
ScreenRecoveryUI::ScreenRecoveryUI() :
+ currentIcon(NONE),
installingFrame(0),
locale(nullptr),
rtl_locale(false),
@@ -75,8 +76,7 @@
animation_fps(-1),
installing_frames(-1),
stage(-1),
- max_stage(-1),
- currentIcon(NONE) {
+ max_stage(-1) {
for (int i = 0; i < 5; i++) {
backgroundIcon[i] = nullptr;