From eb7c801c2eb7f48348779dbf8e027c58a0d75d60 Mon Sep 17 00:00:00 2001 From: Pranav Vashi Date: Wed, 16 Oct 2024 18:54:14 +0530 Subject: [PATCH] Settings: Safeguard ringtone pref against faulty gapps * Gapps which replaces AOSP sound picker and do not overlay config, crashes this preference. Signed-off-by: Pranav Vashi --- src/com/android/settings/RingtonePreference.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java index 6b9dad7ffbf..6117b7df800 100644 --- a/src/com/android/settings/RingtonePreference.java +++ b/src/com/android/settings/RingtonePreference.java @@ -74,8 +74,12 @@ public class RingtonePreference extends Preference { true); mShowSilent = a.getBoolean(com.android.internal.R.styleable.RingtonePreference_showSilent, true); - setIntent(new Intent(RingtoneManager.ACTION_RINGTONE_PICKER) - .setPackage(context.getString(R.string.config_sound_picker_package_name))); + String packageName = context.getString(R.string.config_sound_picker_package_name); + Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER); + if (com.android.internal.util.evolution.Utils.isPackageInstalled(context, packageName)) { + intent.setPackage(packageName); + } + setIntent(intent); setUserId(UserHandle.myUserId()); a.recycle(); }