From 7fc3eab71065b7022547da4bd5f6045634f42ed2 Mon Sep 17 00:00:00 2001 From: "wan.li" Date: Mon, 7 Sep 2020 12:00:04 +0800 Subject: [PATCH] Add the return branch when ringtone position is POS_UNKNOWN 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 --- .../soundpicker/RingtonePickerActivity.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java index d2f168eb5e3e5..285730884a14c 100644 --- a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java +++ b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java @@ -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() {