Merge "Fix bug where a starred contact couldn't be removed" into nyc-dev
diff --git a/src/com/android/dialer/calllog/MissedCallNotifier.java b/src/com/android/dialer/calllog/MissedCallNotifier.java
index 20fc5d5..f683016 100644
--- a/src/com/android/dialer/calllog/MissedCallNotifier.java
+++ b/src/com/android/dialer/calllog/MissedCallNotifier.java
@@ -254,8 +254,9 @@
         intent.setAction(
                 CallLogNotificationsService.ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION);
         intent.putExtra(CallLogNotificationsService.EXTRA_MISSED_CALL_NUMBER, number);
-        // Use FLAG_ONE_SHOT to avoid reusing previous PendingIntent with different number.
-        return PendingIntent.getService(mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+        // Use FLAG_UPDATE_CURRENT to make sure any previous pending intent is updated with the new
+        // extra.
+        return PendingIntent.getService(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     private PendingIntent createSendSmsFromNotificationPendingIntent(String number) {
@@ -263,8 +264,9 @@
         intent.setAction(
                 CallLogNotificationsService.ACTION_SEND_SMS_FROM_MISSED_CALL_NOTIFICATION);
         intent.putExtra(CallLogNotificationsService.EXTRA_MISSED_CALL_NUMBER, number);
-        // Use FLAG_ONE_SHOT to avoid reusing previous PendingIntent with different number.
-        return PendingIntent.getService(mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+        // Use FLAG_UPDATE_CURRENT to make sure any previous pending intent is updated with the new
+        // extra.
+        return PendingIntent.getService(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     /**