commit 5e067df9754f2ff8805edfa1a6dccf9e3048bc9a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 22 18:01:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 22 18:01:19 2020 +0000
tree a7cb2dba8a109be909a5f999319d7fcbbb60cb0b
parent 67ab5e4bee1de0c520dcc7f19d928750cbd879e9
parent 6a6471c8587cd4783685e20581fdd274c2cac3d2

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

Change-Id: Ia3ede7d43fa19237cff255135c3c3e3b71b8b585

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) {