commit 6ff963785cc9eeb35f6cb761cc043b25a832d0f5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 18 00:17:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 18 00:17:33 2023 +0000
tree 5d786e18180cd39da277e3eab5f63dc220d5a01d
parent 23b7949918ee46dc221cb32b6bbac85fe3bdffa5
parent f342dddf893fb548d9ea3ff97d7042fd4d5d392b

Merge "Update Telecom owners." into main am: f080b37601 am: cf7da7d70e am: f342dddf89

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

Change-Id: I9607da7fc2abbe2130c57faffe101c51f78643d9
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);
+                }
+            }
         }
     }