summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2014-09-15 20:27:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-15 20:27:52 +0000
commitf230c5d21be416f276009b0fd0524931cd671488 (patch)
treeaf8a137e8a04aabd0fe267e2a50eda5b0e5ac35f /packages
parentde4e52aa49b10a6271d5616392860a176833381e (diff)
parente771caf332bb3f2b668aaf249b30f37f13755553 (diff)
downloadframeworks_base-f230c5d21be416f276009b0fd0524931cd671488.zip
frameworks_base-f230c5d21be416f276009b0fd0524931cd671488.tar.gz
frameworks_base-f230c5d21be416f276009b0fd0524931cd671488.tar.bz2
Merge "Fix a crash in pring spooler." into lmp-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java4
1 files changed, 4 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 faaf0ae..13eb73f 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
@@ -384,6 +384,10 @@ public final class PageAdapter extends Adapter implements
}
private void updatePreviewAreaPageSizeAndEmptyState() {
+ if (mMediaSize == null) {
+ return;
+ }
+
final int availableWidth = mPreviewArea.getWidth();
final int availableHeight = mPreviewArea.getHeight();