summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-09-02 00:51:56 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-09-02 00:51:56 +0200
commit0cada4da99fb1a5221729b94009b5f9ae36bf0df (patch)
tree2f41ebd17ef21a0edb14010c981358b561e50ab2
parentMerge "wear_ui: Remove backgroundIcon." (diff)
parentMerge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." (diff)
downloadandroid_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.tar
android_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.tar.gz
android_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.tar.bz2
android_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.tar.lz
android_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.tar.xz
android_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.tar.zst
android_bootable_recovery-0cada4da99fb1a5221729b94009b5f9ae36bf0df.zip
-rw-r--r--wear_ui.cpp34
-rw-r--r--wear_ui.h3
2 files changed, 1 insertions, 36 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index b9289d366..670050a0b 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -32,8 +32,8 @@
#include <vector>
#include <android-base/properties.h>
-#include <android-base/strings.h>
#include <android-base/stringprintf.h>
+#include <android-base/strings.h>
#include <minui/minui.h>
#include "common.h"
@@ -312,35 +312,3 @@ void WearRecoveryUI::ShowFile(const char* filename) {
ShowFile(fp);
fclose(fp);
}
-
-void WearRecoveryUI::PrintOnScreenOnly(const char *fmt, ...) {
- va_list ap;
- va_start(ap, fmt);
- PrintV(fmt, false, ap);
- va_end(ap);
-}
-
-void WearRecoveryUI::PrintV(const char* fmt, bool copy_to_stdout, va_list ap) {
- std::string str;
- android::base::StringAppendV(&str, fmt, ap);
-
- if (copy_to_stdout) {
- fputs(str.c_str(), stdout);
- }
-
- pthread_mutex_lock(&updateMutex);
- if (text_rows_ > 0 && text_cols_ > 0) {
- for (const char* ptr = str.c_str(); *ptr != '\0'; ++ptr) {
- if (*ptr == '\n' || text_col_ >= text_cols_) {
- text_[text_row_][text_col_] = '\0';
- text_col_ = 0;
- text_row_ = (text_row_ + 1) % text_rows_;
- if (text_row_ == text_top_) text_top_ = (text_top_ + 1) % text_rows_;
- }
- if (*ptr != '\n') text_[text_row_][text_col_++] = *ptr;
- }
- text_[text_row_][text_col_] = '\0';
- update_screen_locked();
- }
- pthread_mutex_unlock(&updateMutex);
-}
diff --git a/wear_ui.h b/wear_ui.h
index e97598bb1..92ef813f3 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -29,7 +29,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
// printing messages
void Print(const char* fmt, ...) override;
- void PrintOnScreenOnly(const char* fmt, ...) override __printflike(2, 3);
void ShowFile(const char* filename) override;
void ShowFile(FILE* fp) override;
@@ -50,8 +49,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
void update_progress_locked() override;
- void PrintV(const char*, bool, va_list) override;
-
private:
void draw_background_locked() override;
void draw_screen_locked() override;