commit 95ae8cd7188a16ab58376756191ff607e4805864
author Thomas Stuart <tjstuart@google.com> Thu Oct 10 21:14:34 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 10 21:14:34 2024 +0000
tree 687557d73faf4dfa9ae245790e07f6024b16bd87
parent c8d5a877ec5760180a961203cab0170eee252bec
parent f971db1ded79c20d45883e71d17a5f4c85ede8fb

[automerger skipped] enforce the calling package is the default dialer for VisualVoicemail am: cc4364d9ec am: e119828185 am: a9a5d5b740 am: 6c92e9be7a am: ee7892c97e am: 842f72d8bd -s ours am: f971db1ded -s ours

am skip reason: Merged-In I951d7783f5c425c03768efb7aee7a38e299e6536 with SHA-1 cc4364d9ec is already in history

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

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