summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2016-02-29 23:56:30 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-29 23:56:30 +0100
commit9db7964834694e10ce0945e17ac7fefc066d8deb (patch)
tree9c6abab38389c7c536cf8beea4e695726e1a15da
parentMerge "uncrypt: Retire pre-recovery service." into nyc-dev (diff)
parentFixes to wear recovery for N (diff)
downloadandroid_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.tar
android_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.tar.gz
android_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.tar.bz2
android_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.tar.lz
android_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.tar.xz
android_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.tar.zst
android_bootable_recovery-9db7964834694e10ce0945e17ac7fefc066d8deb.zip
Diffstat (limited to '')
-rw-r--r--wear_ui.cpp33
-rw-r--r--wear_ui.h2
2 files changed, 35 insertions, 0 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 50aeb3849..8a57cfffa 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -36,6 +36,7 @@
#include "ui.h"
#include "cutils/properties.h"
#include "android-base/strings.h"
+#include "android-base/stringprintf.h"
static int char_width;
static int char_height;
@@ -653,3 +654,35 @@ void WearRecoveryUI::ClearText() {
}
pthread_mutex_unlock(&updateMutex);
}
+
+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 63c1b6e6e..768141ccc 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -47,6 +47,7 @@ class WearRecoveryUI : public RecoveryUI {
// printing messages
void Print(const char* fmt, ...);
+ void PrintOnScreenOnly(const char* fmt, ...) __printflike(2, 3);
void ShowFile(const char* filename);
void ShowFile(FILE* fp);
@@ -133,6 +134,7 @@ class WearRecoveryUI : public RecoveryUI {
void ClearText();
void DrawTextLine(int x, int* y, const char* line, bool bold);
void DrawTextLines(int x, int* y, const char* const* lines);
+ void PrintV(const char*, bool, va_list);
};
#endif // RECOVERY_WEAR_UI_H