commit 05e48a7c6738fee50aa1c0cf2cefb837fe538aee
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 06 22:16:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 06 22:16:26 2016 +0000
tree 0a95d480e2ef622e103547d2c3e4a4f510530053
parent 7552f3417b0ada08f2329582b9b356b73e2156ba
parent 5e73753062338761ff570207ac1cf6cd78ec4c01

Merge "Address comments on ag/1680345" into ub-calculator-euler

src/com/android/calculator2/HistoryFragment.java

diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index 6e54d9f..3c69628 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -241,11 +241,15 @@
     }
 
     public boolean stopActionModeOrContextMenu() {
+        if (mRecyclerView == null) {
+            return false;
+        }
         for (int i = 0; i < mRecyclerView.getChildCount(); i++) {
             final View view = mRecyclerView.getChildAt(i);
             final HistoryAdapter.ViewHolder viewHolder =
                     (HistoryAdapter.ViewHolder) mRecyclerView.getChildViewHolder(view);
-            if (viewHolder != null && viewHolder.getResult().stopActionModeOrContextMenu()) {
+            if (viewHolder != null && viewHolder.getResult() != null
+                    && viewHolder.getResult().stopActionModeOrContextMenu()) {
                 return true;
             }
         }