commit 4b625e58ff61e4070b39d35d4ec6c7130f6208d5
author Xin Li <delphij@google.com> Tue Sep 05 20:35:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 05 20:35:53 2023 +0000
tree 60b0b85ded71c84f0c01e503ed128a33a6aced4f
parent fd468f745f2aa50abaa8e47a2058c1ddcc87b479
parent b2004e43d1f5463710ba618a6d14d556e3629a49

[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: fc4b5e63aa -s ours am: b2004e43d1 -s ours

am skip reason: Merged-In I2c179c495a46418452a03c3fe67c2dbdff16629e with SHA-1 1a43bf9c61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/24625312

Change-Id: I9d3bfd8673b34a94ac8a09fb11c0f8fe01862958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 60287e5..11887bb 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);
+                }
+            }
         }
     }