commit e03fb103db45f14789b8d1f084952db05fa2fc09
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 18 00:17:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 18 00:17:43 2023 +0000
tree 52dfaca322046cc9ebef4734977caa2b999c0e43
parent 6ff963785cc9eeb35f6cb761cc043b25a832d0f5
parent 1a6b133783f1472ba7b134252f0b9c5014c2dfce

Merge "Update team owners." into main am: 4e7770f770 am: 722cb04bec am: 1a6b133783

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

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