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

Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod

Browse Source 
* changes:
  [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
This commit is contained in:
Arc Wang
2022-06-03 23:33:36 +00:00
committed by Android (Google) Code Review
parent 8d1ed52e6b 03dd4cc7d2
commit 966a2dc8d2
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