From ab0b8567b62b88082a3213a6b085302dc216cfeb Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Wed, 20 Sep 2017 14:06:34 -0700
Subject: Refactor CallList to call onUpdateCall and notifyGenericListeners
 directly.

Bug: 62426694
Test: none
PiperOrigin-RevId: 169447674
Change-Id: I3014b289c26d24ac571421bc54fcacc303278b41
---
 java/com/android/incallui/call/CallList.java | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'java/com/android/incallui')

diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index c4b29d918..1f2c4c6ec 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -127,8 +127,7 @@ public class CallList implements DialerCallDelegate {
     manager.registerStateChangedListener(call);
 
     Trace.beginSection("checkSpam");
-    final DialerCallListenerImpl dialerCallListener = new DialerCallListenerImpl(call);
-    call.addListener(dialerCallListener);
+    call.addListener(new DialerCallListenerImpl(call));
     LogUtil.d("CallList.onCallAdded", "callState=" + call.getState());
     if (Spam.get(context).isSpamEnabled()) {
       String number = TelecomCallUtil.getNumber(telecomCall);
@@ -167,11 +166,12 @@ public class CallList implements DialerCallDelegate {
                             call.getTimeAddedMs());
                   }
                   call.setSpam(isSpam);
-                  dialerCallListener.onDialerCallUpdate();
+                  onUpdateCall(call);
+                  notifyGenericListeners();
                 }
               });
 
-      updateUserMarkedSpamStatus(call, context, number, dialerCallListener);
+      updateUserMarkedSpamStatus(call, context, number);
     }
     Trace.endSection();
 
@@ -185,7 +185,8 @@ public class CallList implements DialerCallDelegate {
           public void onCheckComplete(Integer id) {
             if (id != null && id != FilteredNumberAsyncQueryHandler.INVALID_ID) {
               call.setBlockedStatus(true);
-              dialerCallListener.onDialerCallUpdate();
+              onUpdateCall(call);
+              notifyGenericListeners();
             }
           }
         },
@@ -197,7 +198,8 @@ public class CallList implements DialerCallDelegate {
         || call.getState() == DialerCall.State.CALL_WAITING) {
       onIncoming(call);
     } else {
-      dialerCallListener.onDialerCallUpdate();
+      onUpdateCall(call);
+      notifyGenericListeners();
     }
 
     if (call.getState() != State.INCOMING) {
@@ -244,11 +246,8 @@ public class CallList implements DialerCallDelegate {
     return mCallByTelecomCall.get(telecomCall);
   }
 
-  public void updateUserMarkedSpamStatus(
-      final DialerCall call,
-      final Context context,
-      String number,
-      final DialerCallListenerImpl dialerCallListener) {
+  private void updateUserMarkedSpamStatus(
+      final DialerCall call, final Context context, String number) {
 
     Spam.get(context)
         .checkUserMarkedNonSpamStatus(
-- 
cgit v1.2.3