PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yiyi Shen
2025-02-19 07:38:32 -08:00
committed by Android (Google) Code Review
parent f1c3bfbac3 0ccc9eefc4
commit 2114b0252f
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
View File

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

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

@@ -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 =