Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee2ef20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add the return branch when ringtone position is POS_UNKNOWN" am: 1e973081 am: e2cfc039 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426650

Change-Id: I1d5954304b07fd26a6c82bb156f56f928cf0d3ae
parents 4aeb2ecd e2cfc039

packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java

+13 −9
Original line number Diff line number Diff line
@@ -587,7 +587,11 @@ public final class RingtonePickerActivity extends AlertActivity implements 
    }



    private Uri getCurrentlySelectedRingtoneUri() {

      if (getCheckedItem() == mDefaultRingtonePos) {

        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) {