Merge "Fix NPE in PrintActivity." (39f08827) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -1735,12 +1735,14 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		} else if (spinner == mOrientationSpinner) {
		SpinnerItem<Integer> orientationItem = mOrientationSpinnerAdapter.getItem(position);
		PrintAttributes attributes = mPrintJob.getAttributes();
		if (mMediaSizeSpinner.getSelectedItem() != null) {
		if (orientationItem.value == ORIENTATION_PORTRAIT) {
		attributes.copyFrom(attributes.asPortrait());
		} else {
		attributes.copyFrom(attributes.asLandscape());
		}
		}
		}

		if (canUpdateDocument()) {
		updateDocument(true, false);