commit 4aaaca7ad2b570b43f3446abe6b0b96194d441c3
author twyen <twyen@google.com> Tue Oct 10 13:39:17 2017 -0700
committer Eric Erfanian <erfanian@google.com> Wed Oct 11 07:07:43 2017 -0700
tree ec7eb2710287ce1fd6ce77e74d0c53b4cf9e9f88
parent 090c66de862a6773b6e2bfb50d8bef06e7a8a52e

Ignore self-manged calls for missed call notification

If a PhoneAccount declared it is CAPABILITY_SELF_MANAGED, it should handle the in call UI and notifications itself, but might still write to call log with EXTRA_LOG_SELF_MANAGED_CALLS}.

Bug: 66946794
Test: MissedCallNotifierTest
PiperOrigin-RevId: 171727177
Change-Id: I34444857d432d6bb72983c0ba919bcfef885192b

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

diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
index eb7fab8..8a986dc 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
@@ -18,6 +18,7 @@
 import android.app.Notification;
 import android.app.Notification.Builder;
 import android.app.PendingIntent;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -32,6 +33,9 @@
 import android.support.v4.os.BuildCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.support.v4.util.Pair;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
@@ -57,6 +61,7 @@
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -113,6 +118,8 @@
 
     List<NewCall> newCalls = callLogNotificationsQueryHelper.getNewMissedCalls();
 
+    removeSelfManagedCalls(newCalls);
+
     if ((newCalls != null && newCalls.isEmpty()) || count == 0) {
       // No calls to notify about: clear the notification.
       CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(context);
@@ -236,6 +243,39 @@
     }
   }
 
+  /**
+   * Remove self-managed calls from {@code newCalls}. If a {@link PhoneAccount} declared it is
+   * {@link PhoneAccount#CAPABILITY_SELF_MANAGED}, it should handle the in call UI and notifications
+   * itself, but might still write to call log with {@link
+   * PhoneAccount#EXTRA_LOG_SELF_MANAGED_CALLS}.
+   */
+  private void removeSelfManagedCalls(@Nullable List<NewCall> newCalls) {
+    if (newCalls == null) {
+      return;
+    }
+    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+    Iterator<NewCall> iterator = newCalls.iterator();
+    while (iterator.hasNext()) {
+      NewCall call = iterator.next();
+      if (call.accountComponentName == null || call.accountId == null) {
+        continue;
+      }
+      PhoneAccountHandle phoneAccountHandle =
+          new PhoneAccountHandle(
+              ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
+      PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+      if (phoneAccount == null) {
+        continue;
+      }
+      if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)) {
+        LogUtil.i(
+            "MissedCallNotifier.removeSelfManagedCalls",
+            "ignoring self-managed call " + call.callsUri);
+        iterator.remove();
+      }
+    }
+  }
+
   public static void cancelAllMissedCallNotifications(@NonNull Context context) {
     NotificationManagerUtils.cancelAllInGroup(context, GROUP_KEY);
   }