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

Commit 5522efb1 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Avoid NPE in printspooler when changing language" 

am: 8d8515e7

* commit '8d8515e7':
  Avoid NPE in printspooler when changing language
parents 02cc328d 8d8515e7

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -655,10 +655,12 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
            }

            }

        }

        }





        if (mCurrentPrinter != null) {

            PrinterId printerId = mCurrentPrinter.getId();

            PrinterId printerId = mCurrentPrinter.getId();

            final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);

            final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);

            mDestinationSpinner.setSelection(index);

            mDestinationSpinner.setSelection(index);

        }

        }

    }





    private void startAdvancedPrintOptionsActivity(PrinterInfo printer) {

    private void startAdvancedPrintOptionsActivity(PrinterInfo printer) {

        ComponentName serviceName = printer.getId().getServiceName();

        ComponentName serviceName = printer.getId().getServiceName();