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

Add the return branch when ringtone position is POS_UNKNOWN

Browse Source 
When the getCheckItem is POS_UNKNOWN, it is not the case we expected.
We return null for this case.

Test: manual start RingtonePickerActivity to use
EXTRA_RINGTONE_SHOW_DEFAULT false and EXTRA_RINGTONE_SHOW_SILENT false.
Check the returned EXTRA_RINGTONE_PICKED_URI, it should be null.

Bug: 165892509

Change-Id: Id473dad2e8672a65e5c1b0fee16a7d22e9bcb3e9
This commit is contained in:
wan.li
2020-09-07 12:00:04 +08:00
committed by bing liang
parent fc6fbde5df
commit 7fc3eab710
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java
View File

@@ -584,15 +584,19 @@ public final class RingtonePickerActivity extends AlertActivity implements
}
private Uri getCurrentlySelectedRingtoneUri() {
if (getCheckedItem() == mDefaultRingtonePos) {
// Use the default Uri that they originally gave us.
return mUriForDefaultItem;
} else if (getCheckedItem() == mSilentPos) {
// Use a null Uri for the 'Silent' item.
return null;
} else {
return mRingtoneManager.getRingtoneUri(getRingtoneManagerPosition(getCheckedItem()));
}
if (getCheckedItem() == POS_UNKNOWN) {
// When the getCheckItem is POS_UNKNOWN, it is not the case we expected.
// We return null for this case.
return null;
} else if (getCheckedItem() == mDefaultRingtonePos) {
// Use the default Uri that they originally gave us.
return mUriForDefaultItem;
} else if (getCheckedItem() == mSilentPos) {
// Use a null Uri for the 'Silent' item.
return null;
} else {
return mRingtoneManager.getRingtoneUri(getRingtoneManagerPosition(getCheckedItem()));
}
}
private void saveAnyPlayingRingtone() {