Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1147faa4 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Settings: Handle non-nullness of PrintJobId.unflattenFromString and... 

Merge "Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly."
parents 3cc18408 be37bdff

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

+3 −2
Original line number Diff line number Diff line
@@ -153,9 +153,10 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 


    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

+2 −1
Original line number Diff line number Diff line
@@ -481,7 +481,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
                        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);

                            }

                        }