commit 2acbf6ce2f93d6050f2713a6b895948f6bd6d842
author Philip P. Moltmann <moltmann@google.com> Thu Feb 15 17:38:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 15 17:38:16 2018 +0000
tree 574f2c6b5c95dd0d693c053d009fcf1b186f45c1
parent 8d6427d3321fa0a2797a05846bcba2e7dbd17b79
parent ae2b732ddf246233f0450845aa4664af1a52a393

Merge "Don't attempt to create context menu for 'add printer' entry"

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

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
index 7c2e55f..cf73aac 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
@@ -285,6 +285,11 @@
             final int position = ((AdapterContextMenuInfo) menuInfo).position;
             PrinterInfo printer = (PrinterInfo) mListView.getAdapter().getItem(position);
 
+            // Printer is null if this is a context menu for the "add printer" entry
+            if (printer == null) {
+                return;
+            }
+
             menu.setHeaderTitle(printer.getName());
 
             // Add the select menu item if applicable.