Snap for 4375922 from a79c09493e to pi-release

Change-Id: If5160139fb463c3156dab6e7e17c6044174bbecf

Android.mk

@@ -56,6 +56,7 @@ endif
 LOCAL_MODULE := librecovery
 LOCAL_STATIC_LIBRARIES := \
     libminui \
+    libotautil \
     libvintf_recovery \
     libcrypto_utils \
     libcrypto \

otautil/Android.bp

@@ -30,4 +30,8 @@ cc_library_static {
         "-Werror",
         "-Wall",
     ],
+
+    export_include_dirs: [
+        "include",
+    ],
 }

otautil/DirUtil.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "DirUtil.h"
+#include "otautil/DirUtil.h"
 
 #include <dirent.h>
 #include <errno.h>

otautil/SysUtil.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "SysUtil.h"
+#include "otautil/SysUtil.h"
 
 #include <fcntl.h>
 #include <stdint.h>  // SIZE_MAX

otautil/ThermalUtil.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ThermalUtil.h"
+#include "otautil/ThermalUtil.h"
 
 #include <dirent.h>
 #include <stdio.h>
@@ -77,4 +77,4 @@ int GetMaxValueFromThermalZone() {
   }
   LOG(INFO) << "current maximum temperature: " << max_temperature;
   return max_temperature;
-}
+}

screen_ui.cpp

@@ -165,7 +165,7 @@ void ScreenRecoveryUI::draw_background_locked() {
       int stage_height = gr_get_height(stageMarkerEmpty);
       int stage_width = gr_get_width(stageMarkerEmpty);
       int x = (gr_fb_width() - max_stage * gr_get_width(stageMarkerEmpty)) / 2;
-      int y = gr_fb_height() - stage_height;
+      int y = gr_fb_height() - stage_height - kMarginHeight;
       for (int i = 0; i < max_stage; ++i) {
         GRSurface* stage_surface = (i < stage) ? stageMarkerFill : stageMarkerEmpty;
         gr_blit(stage_surface, 0, 0, stage_width, stage_height, x, y);