commit 39caabc7e3b1ace2a77a48c81132fcae605f2fb9
author Tao Bao <tbao@google.com> Mon Apr 30 19:09:47 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 30 19:09:47 2018 -0700
tree 0fed570a3e44896286726dbaffa3462e907be1ea
parent c3674ab1b2ab409bdc931a4d99e2456d395cb416
parent 7e6119125834b7c9bc9acc5a6beaf73d3c2630a2

Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142
am: 7e61191258

Change-Id: I1db9c680ccbaa877a2c730541133436c16f7d467

device.cpp

diff --git a/device.cpp b/device.cpp
index f881daf..3b0942c 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",

device.h

diff --git a/device.h b/device.h
index 74745b3..4ea3159 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: