From 181ff7c896c705e3d5659ef3e214a7f4eef8bdf3 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 18 Oct 2019 12:16:31 -0400 Subject: [PATCH] Fix flaky test Remove sound from a notification so the vibration is played instantly instead of asynchronously. Test: this Fixes: 141221229 Change-Id: Ib3b48cf56b9cc5e9fb0e1801ad2b835eda85a1ac --- .../com/android/server/notification/BuzzBeepBlinkTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java index 3ae5674e63a32..1e55b1521956d 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -22,6 +22,7 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS; +import static android.media.AudioAttributes.USAGE_NOTIFICATION; import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; import static junit.framework.Assert.assertFalse; @@ -1541,10 +1542,12 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { } @Test - public void testCanInterruptNonRingtoneInsistentBuzz() throws Exception { + public void testCanInterruptNonRingtoneInsistentBuzz() { NotificationChannel fakeRingtoneChannel = new NotificationChannel("ringtone", "", IMPORTANCE_HIGH); fakeRingtoneChannel.enableVibration(true); + fakeRingtoneChannel.setSound(null, + new AudioAttributes.Builder().setUsage(USAGE_NOTIFICATION).build()); NotificationRecord ringtoneNotification = getCallRecord(1, fakeRingtoneChannel, true); mService.buzzBeepBlinkLocked(ringtoneNotification);