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

Merge "Guard NPE in RingtonePrefController"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-27 01:51:18 +00:00
committed by Android (Google) Code Review
parent d5a04e1912 f1b5989706
commit db6e6629b4
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/notification/RingtonePreferenceControllerBase.java
View File

@@ -50,13 +50,18 @@ public abstract class RingtonePreferenceControllerBase extends AbstractPreferenc
}
private void updateSummary(Preference preference) {
Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(mContext, getRingtoneType());
final CharSequence summary = Ringtone.getTitle(
mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);
final Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(
mContext, getRingtoneType());
final CharSequence summary;
if (ringtoneUri == null) {
summary = null;
} else {
summary = Ringtone.getTitle(
mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);
}
if (summary != null) {
ThreadUtils.postOnMainThread(() -> {
preference.setSummary(summary);
});
ThreadUtils.postOnMainThread(() -> preference.setSummary(summary));
}
}