Merge changes Ie520c656,I222009be

* changes:
  Don't show Lightbringer disclosure dialog after 1 day since viewed.
  Fix crash on ending call.

2 files changed, 8 insertions, 0 deletions

diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 6540b6f95..e79c89c57 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -407,6 +407,11 @@ public class CallLogAdapter extends GroupingListAdapter
         }
       };
 
+  @Nullable
+  public RecyclerView.OnScrollListener getOnScrollListener() {
+    return null;
+  }
+
   private void checkMarkCallLogEntry(CallLogListItemViewHolder viewHolder) {
     announceforAccessibility(
         mActivity.getCurrentFocus(),
diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 441cb4a5c..8ed924d76 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -352,6 +352,9 @@ public class CallLogFragment extends Fragment
                 new FilteredNumberAsyncQueryHandler(getActivity()),
                 activityType);
     mRecyclerView.setAdapter(mAdapter);
+    if (mAdapter.getOnScrollListener() != null) {
+      mRecyclerView.addOnScrollListener(mAdapter.getOnScrollListener());
+    }
     fetchCalls();
   }