From a7f50f29f0a762acc7d80691a939cd54207b7533 Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 30 Apr 2018 15:33:07 -0700
Subject: Cancel all legacy voicemail notification when SIMs are removed on
 multi-SIM devices

When the SIM is removed, telephony will signal cancel notifications on the "null" account (the framework doen't know what was there.). Previously this has no effect. In this CL, all legacy voicemail notifications are removed since all SIM will be removed together.

TEST=TAP
Bug: 78446801
Test: TAP
PiperOrigin-RevId: 194856211
Change-Id: I5df97f0c73e0644daa46ab182f19e60044e39d96
---
 .../app/calllog/LegacyVoicemailNotifier.java       | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'java/com/android/dialer/app')

diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
index f37d52d68..f142399d7 100644
--- a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
+++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
@@ -145,10 +145,10 @@ public final class LegacyVoicemailNotifier {
         return phoneAccount.getShortDescription().toString();
       }
     }
-      return String.format(
-          context.getString(R.string.notification_voicemail_text_format),
-          PhoneNumberHelper.formatNumber(
-              context, voicemailNumber, GeoUtil.getCurrentCountryIso(context)));
+    return String.format(
+        context.getString(R.string.notification_voicemail_text_format),
+        PhoneNumberHelper.formatNumber(
+            context, voicemailNumber, GeoUtil.getCurrentCountryIso(context)));
   }
 
   public static void cancelNotification(
@@ -156,8 +156,18 @@ public final class LegacyVoicemailNotifier {
     LogUtil.enterBlock("LegacyVoicemailNotifier.cancelNotification");
     Assert.checkArgument(BuildCompat.isAtLeastO());
     Assert.isNotNull(phoneAccountHandle);
-    DialerNotificationManager.cancel(
-        context, getNotificationTag(context, phoneAccountHandle), NOTIFICATION_ID);
+    if ("null".equals(phoneAccountHandle.getId())) {
+      // while PhoneAccountHandle itself will never be null, telephony may still construct a "null"
+      // handle if the SIM is no longer available. Usually both SIM will be removed at the sames
+      // time, so just clear all notifications.
+      LogUtil.i(
+          "LegacyVoicemailNotifier.cancelNotification",
+          "'null' id, canceling all legacy voicemail notifications");
+      DialerNotificationManager.cancelAll(context, NOTIFICATION_TAG);
+    } else {
+      DialerNotificationManager.cancel(
+          context, getNotificationTag(context, phoneAccountHandle), NOTIFICATION_ID);
+    }
   }
 
   @NonNull
-- 
cgit v1.2.3