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

Commit 9ae9cf19 authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main... 

Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main am: 3bd28b58 am: ca6f28e8

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



Change-Id: I4fb09f269376af348b2798dce42d06d3b6e07f49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c0ef281 ca6f28e8

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

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ public final class RingtonePickerActivity extends AlertActivity implements 
                }

            };

            installTask.execute(data.getData());

        } else if (requestCode == ADD_FILE_REQUEST_CODE && resultCode == RESULT_CANCELED) {

            setupAlert();

        }

    }