summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-05-01 04:41:10 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-05-01 04:41:10 +0200
commit7ffa008463d282902fe96decddb6aa8250bc6161 (patch)
tree0fed570a3e44896286726dbaffa3462e907be1ea
parentMerge changes I78839ed4,I75ac0e26 am: e4d65b681a am: 040674586b (diff)
parentMerge "Drop '#include "ui.h"' from device.h." am: 2de12da142 (diff)
downloadandroid_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.tar
android_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.tar.gz
android_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.tar.bz2
android_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.tar.lz
android_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.tar.xz
android_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.tar.zst
android_bootable_recovery-7ffa008463d282902fe96decddb6aa8250bc6161.zip
-rw-r--r--device.cpp2
-rw-r--r--device.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/device.cpp b/device.cpp
index f881daff6..3b0942c49 100644
--- a/device.cpp
+++ b/device.cpp
@@ -16,6 +16,8 @@
#include "device.h"
+#include "ui.h"
+
static const char* MENU_ITEMS[] = {
"Reboot system now",
"Reboot to bootloader",
diff --git a/device.h b/device.h
index 74745b36c..4ea3159bd 100644
--- a/device.h
+++ b/device.h
@@ -17,7 +17,8 @@
#ifndef _RECOVERY_DEVICE_H
#define _RECOVERY_DEVICE_H
-#include "ui.h"
+// Forward declaration to avoid including "ui.h".
+class RecoveryUI;
class Device {
public: