summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-06-29 09:32:53 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-06-29 09:32:53 +0200
commitbe8a565c397fabf7281077b40917a307717fe3d3 (patch)
treeea31a1ffee1410449969732de2e2fad1718f51c2
parentrelease-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-4140700 snap-temp-L81200000078275553 (diff)
parentMerge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f am: c3437622cc (diff)
downloadandroid_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.tar
android_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.tar.gz
android_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.tar.bz2
android_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.tar.lz
android_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.tar.xz
android_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.tar.zst
android_bootable_recovery-be8a565c397fabf7281077b40917a307717fe3d3.zip
-rw-r--r--Android.mk3
-rw-r--r--wear_ui.cpp11
-rw-r--r--wear_ui.h2
3 files changed, 2 insertions, 14 deletions
diff --git a/Android.mk b/Android.mk
index 95c8823e3..3eed7a696 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,7 +59,8 @@ LOCAL_STATIC_LIBRARIES := \
libvintf_recovery \
libcrypto_utils \
libcrypto \
- libbase
+ libbase \
+ libziparchive \
include $(BUILD_STATIC_LIBRARY)
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 640f04a79..a29746cdc 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -363,17 +363,6 @@ void WearRecoveryUI::ShowFile(const char* filename) {
fclose(fp);
}
-void WearRecoveryUI::ClearText() {
- pthread_mutex_lock(&updateMutex);
- text_col_ = 0;
- text_row_ = 0;
- text_top_ = 1;
- for (size_t i = 0; i < text_rows_; ++i) {
- memset(text_[i], 0, text_cols_ + 1);
- }
- pthread_mutex_unlock(&updateMutex);
-}
-
void WearRecoveryUI::PrintOnScreenOnly(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
diff --git a/wear_ui.h b/wear_ui.h
index e108d4d7e..a814118c7 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -75,10 +75,8 @@ class WearRecoveryUI : public ScreenRecoveryUI {
void draw_background_locked() override;
void draw_screen_locked() override;
- void draw_progress_locked();
void PutChar(char);
- void ClearText();
};
#endif // RECOVERY_WEAR_UI_H