Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in PrintActivity.

Browse Source 
It is possible that the orientation is chosen before the media size.
The code handling orientation change was wrognly expecting to have
a selected media size all the time resulting in a NPE.

bug:15512333

Change-Id: I9f2786af314641144a24c1d1363c8d2590b0df57
This commit is contained in:
Svetoslav
2014-06-12 10:43:20 -07:00
parent 4604abc97d
commit e3bbb3d6c0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -1735,10 +1735,12 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
} 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());
}
}
}