From be15ba86a76b22348fbdeab79fe5014a0723807c Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Mon, 23 Dec 2024 09:54:36 -0800
Subject: [PATCH] Add default Sound Picker package name

To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
---
 res/values/config.xml                            | 5 +++++
 src/com/android/settings/RingtonePreference.java | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index d7528c63bd0..8570dd717d7 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -253,6 +253,11 @@
     <!-- Settings intelligence interaction log intent action -->
     <string name="config_settingsintelligence_log_action" translatable="false"></string>
 
+    <!-- Sound picker package name -->
+    <string name="config_sound_picker_package_name" translatable="false">
+        com.android.soundpicker
+    </string>
+
     <!-- AOSP Emergency app package name -->
     <string name="config_aosp_emergency_package_name" translatable="false">
         com.android.emergency
diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java
index d283e390fc7..560fdc6df37 100644
--- a/src/com/android/settings/RingtonePreference.java
+++ b/src/com/android/settings/RingtonePreference.java
@@ -74,7 +74,8 @@ public class RingtonePreference extends Preference {
                 true);
         mShowSilent = a.getBoolean(com.android.internal.R.styleable.RingtonePreference_showSilent,
                 true);
-        setIntent(new Intent(RingtoneManager.ACTION_RINGTONE_PICKER));
+        setIntent(new Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
+                .setPackage(context.getString(R.string.config_sound_picker_package_name)));
         setUserId(UserHandle.myUserId());
         a.recycle();
     }