diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
index bf55255a7f25a..ef255012b8707 100644
--- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
+++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
@@ -438,9 +438,18 @@ public class AccessibilityShortcutController {
? AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY
: AudioAttributes.USAGE_NOTIFICATION_EVENT;
+ // Use the default accessibility notification sound instead to avoid users confusing the new
+ // notification received. Point to the default notification sound if the sound does not
+ // exist.
+ final Uri ringtoneUri = Uri.parse("file://"
+ + mContext.getString(R.string.config_defaultAccessibilityNotificationSound));
+ Ringtone tone = mFrameworkObjectProvider.getRingtone(mContext, ringtoneUri);
+ if (tone == null) {
+ tone = mFrameworkObjectProvider.getRingtone(mContext,
+ Settings.System.DEFAULT_NOTIFICATION_URI);
+ }
+
// Play a notification tone
- final Ringtone tone = mFrameworkObjectProvider.getRingtone(mContext,
- Settings.System.DEFAULT_NOTIFICATION_URI);
if (tone != null) {
tone.setAudioAttributes(new AudioAttributes.Builder()
.setUsage(audioAttributesUsage)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index d852bab1b39c0..0b5d66dd13c09 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4098,7 +4098,9 @@
exists on the device, the accessibility shortcut will be disabled by default. -->
-
+
+
+