| commit | 9ae9cf198b82c31867585f91efef50d35648251a | [log] [tgz] |
|---|---|---|
| author | Lais Andrade <lsandrade@google.com> | Wed Feb 28 11:54:04 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 28 11:54:04 2024 +0000 |
| tree | faf8c37fd17d257ef1ec42b1b3cee245fde3b3e4 | |
| parent | 1c0ef281e885165857d4f8ee1b731b7aab5cc6aa [diff] | |
| parent | ca6f28e8f471024d82b6c4d522f084f1b1a604da [diff] |
Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main am: 3bd28b5829 am: ca6f28e8f4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537217 Change-Id: I4fb09f269376af348b2798dce42d06d3b6e07f49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java index ea46c0c..ee81813 100644 --- a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java +++ b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java
@@ -300,6 +300,8 @@ } }; installTask.execute(data.getData()); + } else if (requestCode == ADD_FILE_REQUEST_CODE && resultCode == RESULT_CANCELED) { + setupAlert(); } }