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

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



Change-Id: I65e482193ab44e09bc89321a87358860157e1c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -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();
         }
     }