commit c9b0fe71721b78fa1c3c6163cca52329f950ed9a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 22 17:46:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 22 17:46:03 2020 +0000
tree 5808799b9dc90f00facdcd42708bab571928de64
parent 9af39bf5c49811c08ed037e9a49c8fc26c8ffbfa
parent f5b94d6e9b0f9a5f3924dacbe0bfca038a8a32fb

Merge "Recovery UI meet issue if image size is too large" am: f5b94d6e9b

Change-Id: I358dc2c378a2301b46046832ae4c168e7a6fb649

recovery_ui/screen_ui.cpp

diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index 087fc0e..6dcb161 100644
--- a/recovery_ui/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -448,7 +448,9 @@
     int frame_height = gr_get_height(frame);
     int frame_x = (ScreenWidth() - frame_width) / 2;
     int frame_y = GetAnimationBaseline();
-    DrawSurface(frame, 0, 0, frame_width, frame_height, frame_x, frame_y);
+    if (frame_x >= 0 && frame_y >= 0 && (frame_x + frame_width) < ScreenWidth() &&
+        (frame_y + frame_height) < ScreenHeight())
+      DrawSurface(frame, 0, 0, frame_width, frame_height, frame_x, frame_y);
   }
 
   if (progressBarType != EMPTY) {