commit 3197212a7485bac74c6b0aa3312337d28ba9caa7
author Yiqun Wu <yiqunw@google.com> Fri Sep 25 06:45:39 2020 -0700
committer Yiqun Wu <yiqunw@google.com> Mon Oct 05 22:28:59 2020 +0000
tree ab4032c7f9d67de698604c804b8349ea29ef5079
parent 22d7c4c42d278add689e166b43fbe316fb824ed8

Fix missed call notification calling back wrong number

The issue is caused by how PendingIntent is created.

Fixes: 168557686
Test: manually

Change-Id: I82b59feefe48326cfe56df71eb099b4f32f24668

src/com/android/car/dialer/notification/MissedCallNotificationController.java

diff --git a/src/com/android/car/dialer/notification/MissedCallNotificationController.java b/src/com/android/car/dialer/notification/MissedCallNotificationController.java
index 13ac6f7..717a985 100644
--- a/src/com/android/car/dialer/notification/MissedCallNotificationController.java
+++ b/src/com/android/car/dialer/notification/MissedCallNotificationController.java
@@ -96,7 +96,7 @@
     private final UnreadMissedCallLiveData mUnreadMissedCallLiveData;
     private final Observer<List<PhoneCallLog>> mUnreadMissedCallObserver;
     private final List<PhoneCallLog> mCurrentPhoneCallLogList;
-    private final Map<String, CompletableFuture<Void>> mUpdateFutures;
+    private final Map<String, CompletableFuture<Void>> mUpdateFutures = new HashMap<>();
 
     @TargetApi(26)
     private MissedCallNotificationController(Context context) {
@@ -112,8 +112,6 @@
         mUnreadMissedCallLiveData = UnreadMissedCallLiveData.newInstance(context);
         mUnreadMissedCallObserver = this::updateNotifications;
         mUnreadMissedCallLiveData.observeForever(mUnreadMissedCallObserver);
-
-        mUpdateFutures = new HashMap<>();
     }
 
     /**
@@ -125,9 +123,7 @@
                 phoneCallLogs == null ? Collections.emptyList() : phoneCallLogs;
         for (PhoneCallLog phoneCallLog : updatedPhoneCallLogs) {
             showMissedCallNotification(phoneCallLog);
-            if (mCurrentPhoneCallLogList.contains(phoneCallLog)) {
-                mCurrentPhoneCallLogList.remove(phoneCallLog);
-            }
+            mCurrentPhoneCallLogList.remove(phoneCallLog);
         }
 
         for (PhoneCallLog phoneCallLog : mCurrentPhoneCallLogList) {
@@ -141,11 +137,8 @@
         L.d(TAG, "show missed call notification %s", callLog);
         String phoneNumber = callLog.getPhoneNumberString();
         String tag = getTag(callLog);
-        CompletableFuture<Void> updateFuture = mUpdateFutures.get(tag);
-        if (updateFuture != null) {
-            updateFuture.cancel(true);
-        }
-        updateFuture = NotificationUtils.getDisplayNameAndRoundedAvatar(
+        cancelLoadingRunnable(tag);
+        CompletableFuture<Void> updateFuture = NotificationUtils.getDisplayNameAndRoundedAvatar(
                 mContext, phoneNumber)
                 .thenAcceptAsync((pair) -> {
                     int callLogSize = callLog.getAllCallRecords().size();
@@ -179,7 +172,15 @@
     private void cancelMissedCallNotification(PhoneCallLog phoneCallLog) {
         L.d(TAG, "cancel missed call notification %s", phoneCallLog);
         String tag = getTag(phoneCallLog);
+        cancelLoadingRunnable(tag);
         mNotificationManager.cancel(tag, NOTIFICATION_ID);
+    }
+
+    private void cancelLoadingRunnable(String tag) {
+        CompletableFuture<Void> completableFuture = mUpdateFutures.get(tag);
+        if (completableFuture != null) {
+            completableFuture.cancel(true);
+        }
         mUpdateFutures.remove(tag);
     }
 
@@ -208,18 +209,19 @@
     private Notification.Action getAction(String phoneNumberString, @StringRes int actionText,
             String intentAction) {
         CharSequence text = mContext.getString(actionText);
-        PendingIntent intent = PendingIntent.getService(
-                mContext,
-                0,
-                getIntent(intentAction, phoneNumberString),
-                PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent intent = getIntent(intentAction, phoneNumberString);
         return new Notification.Action.Builder(null, text, intent).build();
     }
 
-    private Intent getIntent(String action, String phoneNumberString) {
+    private PendingIntent getIntent(String action, String phoneNumberString) {
         Intent intent = new Intent(action, null, mContext, NotificationService.class);
         intent.putExtra(NotificationService.EXTRA_CALL_ID, phoneNumberString);
-        return intent;
+        return PendingIntent.getService(
+                mContext,
+                // Unique id for PendingIntents with different extras
+                /* requestCode= */(int) System.currentTimeMillis(),
+                intent,
+                PendingIntent.FLAG_IMMUTABLE);
     }
 
     private String getTag(@NonNull PhoneCallLog phoneCallLog) {