From 3c837277e3054083910b025d3356c3d71a63a792 Mon Sep 17 00:00:00 2001 From: jhenrique09 Date: Tue, 7 Jun 2022 16:04:37 +0000 Subject: [PATCH] Settings: Fix ringtone selection for devices with e-SIM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/PixelExperience/android-issues/issues/2651 Change-Id: Ib283876196346b3b5492b8b4403530227cdf961e (cherry picked from commit 4b275f3f518acc939a73523569602f6112737fc0) Signed-off-by: Hưng Phan Signed-off-by: Pranav Vashi --- .../PhoneRingtone2PreferenceController.java | 13 ++++++++----- .../PhoneRingtonePreferenceController.java | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java b/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java index 1233e28642a..495d9848972 100644 --- a/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java +++ b/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java @@ -43,8 +43,14 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro DefaultRingtonePreference ringtonePreference = (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE2); ringtonePreference.setSlotId(SLOT_ID); - ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title) + " - " + - String.format(mContext.getString(R.string.sim_card_number_title), 2)); + + if (isBuiltInEuiccSlot(SLOT_ID)) { + ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title) + " (e-SIM)"); + } else { + ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title) + " - " + + String.format(mContext.getString(R.string.sim_card_number_title), 2)); + } + ringtonePreference.setEnabled(hasCard()); } @@ -55,9 +61,6 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro @Override public boolean isAvailable() { - if (isBuiltInEuiccSlot(SLOT_ID)) { - return false; - } TelephonyManager telephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); return Utils.isVoiceCapable(mContext) && telephonyManager.isMultiSimEnabled(); diff --git a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java index f70ee66c9c8..0ad2a50b8ee 100644 --- a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java +++ b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java @@ -44,7 +44,7 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl TelephonyManager telephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); - if (telephonyManager.isMultiSimEnabled() && !isDeviceSupportsESIM()) { + if (telephonyManager.isMultiSimEnabled()) { DefaultRingtonePreference ringtonePreference = (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE); ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title));