commit 39f0882786461bef7916bbe1fb2fa9d5679dcb4a
author Svetoslav <svetoslavganov@google.com> Thu Jun 12 17:46:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 11 21:23:31 2014 +0000
tree 4ede752af77c555a5e899b82801baf037b341f0c
parent 530ae0a5ecb680a6e60b74a08c2726a74a440a75
parent e3bbb3d6c09a29cddeb544308e5b3210908fa256

Merge "Fix NPE in PrintActivity."

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index f71cafe..3e0d7e5 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -1735,10 +1735,12 @@
             } else if (spinner == mOrientationSpinner) {
                 SpinnerItem<Integer> orientationItem = mOrientationSpinnerAdapter.getItem(position);
                 PrintAttributes attributes = mPrintJob.getAttributes();
-                if (orientationItem.value == ORIENTATION_PORTRAIT) {
-                    attributes.copyFrom(attributes.asPortrait());
-                } else {
-                    attributes.copyFrom(attributes.asLandscape());
+                if (mMediaSizeSpinner.getSelectedItem() != null) {
+                    if (orientationItem.value == ORIENTATION_PORTRAIT) {
+                        attributes.copyFrom(attributes.asPortrait());
+                    } else {
+                        attributes.copyFrom(attributes.asLandscape());
+                    }
                 }
             }