commit 78ad84e351ff5286ce447a805500943da4fdb0c6
author Oli Thompson <olit@google.com> Tue Aug 01 21:42:23 2023 +0000
committer Amruth Ramachandran <amruthr@google.com> Fri Aug 04 18:39:41 2023 +0000
tree 9b8de0c0c1f302fb624dd387b389ecbc9ca33381
parent a72690594e014f29215baea59037a18fd9f36706

Fix telephony persistent voicemail notification

Test: manually tested,Telephony QA: 294411211
Bug: 291562725
Change-Id: Ib022a0d13ae314d79b7841540e368fa1d76bfaad

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index b28bd5c..e111a2d 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -409,7 +409,22 @@
                 }
             }
         } else {
-            cancelAsUser(Integer.toString(subId) /* tag */, VOICEMAIL_NOTIFICATION, UserHandle.ALL);
+            UserHandle subAssociatedUserHandle =
+                    mSubscriptionManager.getSubscriptionUserHandle(subId);
+            List<UserHandle> users = getUsersExcludeDying();
+            for (UserHandle userHandle : users) {
+                boolean isManagedUser = mUserManager.isManagedProfile(userHandle.getIdentifier());
+                if (!hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, userHandle)
+                        && (userHandle.equals(subAssociatedUserHandle)
+                            || (subAssociatedUserHandle == null && !isManagedUser))
+                        && !maybeSendVoicemailNotificationUsingDefaultDialer(phone, 0, null, null,
+                        false, userHandle, isRefresh)) {
+                    cancelAsUser(
+                            Integer.toString(subId) /* tag */,
+                            VOICEMAIL_NOTIFICATION,
+                            userHandle);
+                }
+            }
         }
     }