diff options
| author | 2024-03-23 22:21:53 +0000 | |
|---|---|---|
| committer | 2024-03-24 15:10:36 +0000 | |
| commit | e6116ff8b10baaaed52944638ac93b8972e41b2b (patch) | |
| tree | a5c7ee571916dbf4e3a5c1026fe4009d720efa5d | |
| parent | 04f59b8f73dd62468452d9152c66774d97dd185f (diff) | |
Fix for the following flaky tests:
VibrationThreadTest#vibrate_singleWaveformWithAdaptiveHapticsScaling_scalesAmplitudesProperly
VibratorManagerServiceTest#vibrate_withAdaptiveHaptics_appliesCorrectAdaptiveScales
Fix: 330872290
Fix: 328912477
Test: atest VibrationThreadTest/VibratorManagerServiceTest
Change-Id: I28cca52ab7c59e4b92520ab80913477a79324d8e
| -rw-r--r-- | services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java | 6 | ||||
| -rw-r--r-- | services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java b/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java index 0b76154d73d0..19ce217e581c 100644 --- a/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java +++ b/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java @@ -251,9 +251,9 @@ public class VibrationThreadTest { VibrationEffect effect = VibrationEffect.createWaveform( new long[]{5, 5, 5}, new int[]{1, 1, 1}, -1); - CompletableFuture<Void> mRequestVibrationParamsFuture = CompletableFuture.runAsync(() -> { - mVibrationScaler.updateAdaptiveHapticsScale(USAGE_RINGTONE, 0.5f); - }); + mVibrationScaler.updateAdaptiveHapticsScale(USAGE_RINGTONE, 0.5f); + CompletableFuture<Void> mRequestVibrationParamsFuture = CompletableFuture.completedFuture( + null); long vibrationId = startThreadAndDispatcher(effect, mRequestVibrationParamsFuture, USAGE_RINGTONE); waitForCompletion(); diff --git a/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java b/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java index 5861d88924e0..185677f966a4 100644 --- a/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java +++ b/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java @@ -1589,7 +1589,8 @@ public class VibratorManagerServiceTest { assertEquals(1f, ((PrimitiveSegment) segments.get(2)).getScale(), 1e-5); verify(mVibratorFrameworkStatsLoggerMock).logVibrationAdaptiveHapticScale(UID, 0.7f); verify(mVibratorFrameworkStatsLoggerMock).logVibrationAdaptiveHapticScale(UID, 0.4f); - verify(mVibratorFrameworkStatsLoggerMock).logVibrationAdaptiveHapticScale(UID, 1f); + verify(mVibratorFrameworkStatsLoggerMock, + timeout(TEST_TIMEOUT_MILLIS)).logVibrationAdaptiveHapticScale(UID, 1f); } @Test |