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,10 +655,12 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
} }
} }
if (mCurrentPrinter != null) {
PrinterId printerId = mCurrentPrinter.getId(); PrinterId printerId = mCurrentPrinter.getId();
final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId); final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);
mDestinationSpinner.setSelection(index); mDestinationSpinner.setSelection(index);
} }
}
private void startAdvancedPrintOptionsActivity(PrinterInfo printer) { private void startAdvancedPrintOptionsActivity(PrinterInfo printer) {
ComponentName serviceName = printer.getId().getServiceName(); ComponentName serviceName = printer.getId().getServiceName();