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

Commit 2114b025 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Handle cancel notification in receiver" into main

parents f1c3bfba 0ccc9eef

src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,12 @@ public class AudioSharingReceiver extends BroadcastReceiver { 
                    showAddSourceNotification(context, device);

                }

                break;

            case ACTION_LE_AUDIO_SHARING_CANCEL_NOTIF:

                int notifId = intent.getIntExtra(EXTRA_NOTIF_ID, -1);

                if (notifId != -1) {

                    cancelSharingNotification(context, notifId);

                }

                break;

            default:

                Log.w(TAG, "Received unexpected intent " + intent.getAction());

        }

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java

+16 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ import java.util.stream.Collectors; 
public class AudioSharingReceiverTest {

    private static final String ACTION_LE_AUDIO_SHARING_STOP =

            "com.android.settings.action.BLUETOOTH_LE_AUDIO_SHARING_STOP";

    private static final String ACTION_LE_AUDIO_SHARING_CANCEL_NOTIF =

            "com.android.settings.action.BLUETOOTH_LE_AUDIO_SHARING_CANCEL_NOTIF";

    private static final String EXTRA_NOTIF_ID = "NOTIF_ID";

    private static final String TEST_DEVICE_NAME = "test";



    @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -343,6 +346,19 @@ public class AudioSharingReceiverTest { 
                any(Notification.class));

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void broadcastReceiver_receiveAudioSharingCancelNotif_cancel() {

        Intent intent = new Intent(ACTION_LE_AUDIO_SHARING_CANCEL_NOTIF);

        intent.setPackage(mContext.getPackageName());

        intent.putExtra(EXTRA_NOTIF_ID,

                com.android.settings.R.string.share_audio_notification_title);

        AudioSharingReceiver audioSharingReceiver = getAudioSharingReceiver(intent);

        audioSharingReceiver.onReceive(mContext, intent);



        verify(mNm).cancel(com.android.settings.R.string.share_audio_notification_title);

    }



    private AudioSharingReceiver getAudioSharingReceiver(Intent intent) {

        assertThat(mShadowApplication.hasReceiverForIntent(intent)).isTrue();

        List<BroadcastReceiver> receiversForIntent =