commit be37bdff48e311e4df55bcc36f3acd1e49f74c9c
author Philip P. Moltmann <moltmann@google.com> Thu Jan 14 15:35:06 2016 -0800
committer Philip P. Moltmann <moltmann@google.com> Thu Jan 21 09:16:25 2016 -0800
tree bcd22005c37766edbbcdd81920128c5b44e0fa44
parent e32497c6de3f5ec3d494474da9c7ad04db76ef79

Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly.

Change-Id: If22acfee7c6a7c21803fe79ff04f33181dd10167

src/com/android/settings/print/PrintJobSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 80bf166..11b4ba2 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -153,9 +153,10 @@
 
     private void processArguments() {
         String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID);
-        mPrintJobId = PrintJobId.unflattenFromString(printJobId);
-        if (mPrintJobId == null) {
+        if (printJobId == null) {
             finish();
+        } else {
+            mPrintJobId = PrintJobId.unflattenFromString(printJobId);
         }
     }
 

src/com/android/settings/print/PrintServiceSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 5d20f65..2ac84f4 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -481,7 +481,8 @@
                         final int printerCount = mPrinters.size();
                         for (int i = 0; i < printerCount; i++) {
                             PrinterInfo printer = mPrinters.get(i);
-                            if (printer.getName().toLowerCase().contains(constraintLowerCase)) {
+                            String name = printer.getName();
+                            if (name != null && name.toLowerCase().contains(constraintLowerCase)) {
                                 filteredPrinters.add(printer);
                             }
                         }