commit 3d05fe29e87fefe80afa88ecd6c291d0580ddfdd
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 25 17:48:30 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 25 17:48:30 2017 +0000
tree 309216e8a59f2ef5eafe5263ae890bcdd1e18334
parent cf882d5b703b965c0338cbca3adb18993671b1f0
parent 8db7caad865c38b629c1cb0f3383972cb86f2ed5

Merge changes Ie520c656,I222009be

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

java/com/android/dialer/app/calllog/CallLogAdapter.java

diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 6540b6f..e79c89c 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -407,6 +407,11 @@
         }
       };
 
+  @Nullable
+  public RecyclerView.OnScrollListener getOnScrollListener() {
+    return null;
+  }
+
   private void checkMarkCallLogEntry(CallLogListItemViewHolder viewHolder) {
     announceforAccessibility(
         mActivity.getCurrentFocus(),

java/com/android/dialer/app/calllog/CallLogFragment.java

diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 441cb4a..8ed924d 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -352,6 +352,9 @@
                 new FilteredNumberAsyncQueryHandler(getActivity()),
                 activityType);
     mRecyclerView.setAdapter(mAdapter);
+    if (mAdapter.getOnScrollListener() != null) {
+      mRecyclerView.addOnScrollListener(mAdapter.getOnScrollListener());
+    }
     fetchCalls();
   }
 

java/com/android/incallui/InCallActivityCommon.java

diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index fec9700..9e6271f 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -317,10 +317,6 @@
     if (dialpadFragment != null) {
       dialpadFragment.onDialerKeyUp(null);
     }
-
-    if (inCallActivity.isFinishing()) {
-      InCallPresenter.getInstance().unsetActivity(inCallActivity);
-    }
   }
 
   public void onStop() {
@@ -342,6 +338,9 @@
     if (!isRecreating) {
       InCallPresenter.getInstance().onUiShowing(false);
     }
+    if (inCallActivity.isFinishing()) {
+      InCallPresenter.getInstance().unsetActivity(inCallActivity);
+    }
   }
 
   public void onDestroy() {