| commit | 57f7e35572a20b6ff4bd99fb714e2efcbf8023bb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 25 00:51:24 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 25 00:51:24 2018 +0000 |
| tree | 26ec99d46b4159588a4ae8c808fc46ecd798882b | |
| parent | d17cc01303cf3cd88c01291526b98787706af1eb [diff] | |
| parent | 86249eb88ba30079bf135d0db8ab6562709c57a2 [diff] |
Merge "Check for null mGapWorker in onDetachedFromWindow"
diff --git a/v7/recyclerview/src/main/java/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/main/java/android/support/v7/widget/RecyclerView.java index cfa28e8..cde1f79 100644 --- a/v7/recyclerview/src/main/java/android/support/v7/widget/RecyclerView.java +++ b/v7/recyclerview/src/main/java/android/support/v7/widget/RecyclerView.java
@@ -2642,7 +2642,7 @@ removeCallbacks(mItemAnimatorRunner); mViewInfoStore.onDetach(); - if (ALLOW_THREAD_GAP_WORK) { + if (ALLOW_THREAD_GAP_WORK && mGapWorker != null) { // Unregister with gap worker mGapWorker.remove(this); mGapWorker = null;