summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-08-14 19:57:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-08-14 19:57:26 +0000
commit4a41744919476cf9f88e355863af18b014437b68 (patch)
tree5b6d7968789f373c4bc1284621285a94dc4af7cd
parent9282d725f06b4dc94cd06573861df15e2bd3c51f (diff)
parente54349fda51592cc16ccd244bd95ebbebb055502 (diff)
downloadbase-4a41744919476cf9f88e355863af18b014437b68.tar.gz
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
index c1a3f865bed4..d556b641454b 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
@@ -467,6 +467,12 @@ public final class PageAdapter extends Adapter<ViewHolder> {
loadingContent.layout(0, 0, loadingContent.getMeasuredWidth(),
loadingContent.getMeasuredHeight());
+ // To create a bitmap, height & width should be larger than 0
+ if (mPageContentHeight <= 0 || mPageContentWidth <= 0) {
+ Log.w(LOG_TAG, "Unable to create bitmap, height or width smaller than 0!");
+ return;
+ }
+
Bitmap loadingBitmap = Bitmap.createBitmap(mPageContentWidth, mPageContentHeight,
Bitmap.Config.ARGB_8888);
loadingContent.draw(new Canvas(loadingBitmap));