Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Fix ringtone selection for devices with e-SIM

Browse Source 
https://github.com/PixelExperience/android-issues/issues/2651

Change-Id: Ib283876196346b3b5492b8b4403530227cdf961e
(cherry picked from commit 4b275f3f518acc939a73523569602f6112737fc0)
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
jhenrique09
2022-06-07 16:04:37 +00:00
committed by Joey
parent 7c29c1956b
commit 3c837277e3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/notification/PhoneRingtone2PreferenceController.java
View File

@@ -43,8 +43,14 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro
DefaultRingtonePreference ringtonePreference = DefaultRingtonePreference ringtonePreference =
(DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE2); (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE2);
ringtonePreference.setSlotId(SLOT_ID); 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()); ringtonePreference.setEnabled(hasCard());
} }
@@ -55,9 +61,6 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
if (isBuiltInEuiccSlot(SLOT_ID)) {
return false;
}
TelephonyManager telephonyManager = TelephonyManager telephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
return Utils.isVoiceCapable(mContext) && telephonyManager.isMultiSimEnabled(); return Utils.isVoiceCapable(mContext) && telephonyManager.isMultiSimEnabled();

2
src/com/android/settings/notification/PhoneRingtonePreferenceController.java
View File

@@ -44,7 +44,7 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
TelephonyManager telephonyManager = TelephonyManager telephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
if (telephonyManager.isMultiSimEnabled() && !isDeviceSupportsESIM()) { if (telephonyManager.isMultiSimEnabled()) {
DefaultRingtonePreference ringtonePreference = DefaultRingtonePreference ringtonePreference =
(DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE); (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE);
ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title)); ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title));