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

Commit 2ce91e24 authored by James Lemieux's avatar James Lemieux
Browse files

Avoid exceptions while launching ringtone picker from non-Activity 

Bug: 34819444
Test: Manually launch the ringtone picker
Change-Id: Id91e051cd18d08dcc87eda70d0519c61e9568961
parent 2a138d4a

src/com/android/deskclock/alarms/AlarmTimeClickHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -169,13 +169,13 @@ public final class AlarmTimeClickHandler { 
        mAlarmUpdateHandler.showPredismissToast(alarmInstance);

    }



    public void onRingtoneClicked(Alarm alarm) {

    public void onRingtoneClicked(Context context, Alarm alarm) {

        mSelectedAlarm = alarm;

        Events.sendAlarmEvent(R.string.action_set_ringtone, R.string.label_deskclock);



        final Intent intent =

                RingtonePickerActivity.createAlarmRingtonePickerIntent(mContext, alarm);

        mContext.startActivity(intent);

                RingtonePickerActivity.createAlarmRingtonePickerIntent(context, alarm);

        context.startActivity(intent);

    }



    public void onEditLabelClicked(Alarm alarm) {

src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public final class ExpandedAlarmViewHolder extends AlarmItemViewHolder { 
        ringtone.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                getAlarmTimeClickHandler().onRingtoneClicked(getItemHolder().item);

                getAlarmTimeClickHandler().onRingtoneClicked(context, getItemHolder().item);

            }

        });

        // Delete alarm handler