Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708

am: 5522efb130

* commit '5522efb1300cfa87a8434bd396093a2ae076fa69':
  Avoid NPE in printspooler when changing language
This commit is contained in:
Svetoslav Ganov
2015-11-10 01:07:27 +00:00
committed by android-build-merger

View File

@@ -655,9 +655,11 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
}
}
PrinterId printerId = mCurrentPrinter.getId();
final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);
mDestinationSpinner.setSelection(index);
if (mCurrentPrinter != null) {
PrinterId printerId = mCurrentPrinter.getId();
final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);
mDestinationSpinner.setSelection(index);
}
}
private void startAdvancedPrintOptionsActivity(PrinterInfo printer) {