commit 1fcfc3124370036d327c9234b321f699a07ebf3c
author Annie Chin <afchin@google.com> Tue Dec 06 09:36:36 2016 -0800
committer Annie Chin <afchin@google.com> Tue Dec 06 11:45:47 2016 -0800
tree 9b882694d41a02b5563d1646df2efb3c0125ae7d
parent c5b6e4fc3366bd9c70200038e20d40789d9ae04d

Add null check in stopActionModeOrContextMenu().

Fixes: 33378283

Change-Id: I9ff6f73d8c757f8acc2672b812023b0c683b07c6

src/com/android/calculator2/HistoryFragment.java

diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index 6e54d9f..5e93d50 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -241,6 +241,9 @@
     }
 
     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 =