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

Commit e2cfc039 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 

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

Change-Id: Id6f84fa9147af94d5923d8892e30233e9fa5f6fe
parents 3ba0f5da 1e973081

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

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

    }





    private Uri getCurrentlySelectedRingtoneUri() {

    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.

            // Use the default Uri that they originally gave us.

            return mUriForDefaultItem;

            return mUriForDefaultItem;

        } else if (getCheckedItem() == mSilentPos) {

        } else if (getCheckedItem() == mSilentPos) {