commit 84a3be8dde18a1ee61f71fcbfd116c61069e4e27
author Thomas Nguyen <tnd@google.com> Tue Aug 22 19:23:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 22 19:23:53 2023 +0000
tree 862cfad5d37e7ad8dcf208efdd3ef9b8058016b8
parent e03fb103db45f14789b8d1f084952db05fa2fc09
parent 6c7b329e2839d68e1729052f33bb98a2cfde115d

Merge "Fix unlock sim thread leak" into main am: 71c1c0a525 am: decd41773b am: 6c7b329e28

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

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