From 86d13f3daf6f5562bd83d086008d287c58d841c3 Mon Sep 17 00:00:00 2001 From: Masaaki Iwaguchi Date: Fri, 3 Apr 2015 16:11:39 +0900 Subject: [PATCH] Avoid NPE in printspooler when changing language PrintActivity is recreated when the language setting is changed. As a result of the recreation mCurrentPrinter is null, which causes a NullPointerException when onActivityResult() is called. The issue is solved with a simple null check. Change-Id: Ic58f0ca01577d2ec02d494739f3bc2f06240dd44 --- .../src/com/android/printspooler/ui/PrintActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index e8a5e43ce874f..14bac4f03ccb6 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -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) {