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

Merge "Avoid NPE in printspooler when changing language"

Browse Source 
am: 8d8515e708

* commit '8d8515e708f0cebf69587750bbb3abcb315cc61e':
  Avoid NPE in printspooler when changing language
This commit is contained in:
Svetoslav Ganov
2015-11-10 01:03:05 +00:00
committed by android-build-merger
parent 02cc328d9d 8d8515e708
commit 5522efb130
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
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();