PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-01-26 18:25:54 +00:00
committed by Android (Google) Code Review
parent 3cc18408c6 be37bdff48
commit 1147faa461
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/print/PrintJobSettingsFragment.java
View File

@@ -153,9 +153,10 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
private void processArguments() { private void processArguments() {
String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID); String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID);
mPrintJobId = PrintJobId.unflattenFromString(printJobId); if (printJobId == null) {
if (mPrintJobId == null) {
finish(); finish();
} else {
mPrintJobId = PrintJobId.unflattenFromString(printJobId);
} }
} }

3
src/com/android/settings/print/PrintServiceSettingsFragment.java
View File

@@ -481,7 +481,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
final int printerCount = mPrinters.size(); final int printerCount = mPrinters.size();
for (int i = 0; i < printerCount; i++) { for (int i = 0; i < printerCount; i++) {
PrinterInfo printer = mPrinters.get(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); filteredPrinters.add(printer);
} }
} }