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

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

Browse Source 
Change-Id: If22acfee7c6a7c21803fe79ff04f33181dd10167
This commit is contained in:
Philip P. Moltmann
2016-01-14 15:35:06 -08:00
parent e32497c6de
commit be37bdff48
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() {
String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID);
mPrintJobId = PrintJobId.unflattenFromString(printJobId);
if (mPrintJobId == null) {
if (printJobId == null) {
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();
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);
}
}