PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595

Bug: 232502532
Bug: 221041256
Change-Id: Ibc32353ed93fd1f1f053066294b375c6cbd101ae
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
This commit is contained in:
Presubmit Automerger Backend
2022-06-02 02:53:24 +00:00
parent a3be04c95d 67b9fb57ea
commit 03dd4cc7d2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/DefaultRingtonePreference.java
View File

@@ -46,6 +46,11 @@ public class DefaultRingtonePreference extends RingtonePreference {
@Override @Override
protected void onSaveRingtone(Uri ringtoneUri) { protected void onSaveRingtone(Uri ringtoneUri) {
if (ringtoneUri == null) {
setActualDefaultRingtoneUri(ringtoneUri);
return;
}
String mimeType = getContext().getContentResolver().getType(ringtoneUri); String mimeType = getContext().getContentResolver().getType(ringtoneUri);
if (mimeType == null) { if (mimeType == null) {
Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri