Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix VibratorManager cmd for on-off waveforms" into tm-dev

Browse Source
This commit is contained in:
Lais Andrade
2022-03-31 18:10:51 +00:00
committed by Android (Google) Code Review
parent dd99260942 bc491a649c
commit 30deaa8bf8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/vibrator/VibratorManagerService.java
View File

@@ -1852,6 +1852,9 @@ public class VibratorManagerService extends IVibratorManagerService.Stub {
Duration transitionDuration = isContinuous Duration transitionDuration = isContinuous
? Duration.ofMillis(durations.get(i)) ? Duration.ofMillis(durations.get(i))
: Duration.ZERO; : Duration.ZERO;
Duration sustainDuration = isContinuous
? Duration.ZERO
: Duration.ofMillis(durations.get(i));
if (hasFrequencies) { if (hasFrequencies) {
waveform.addTransition(transitionDuration, targetAmplitude(amplitudes.get(i)), waveform.addTransition(transitionDuration, targetAmplitude(amplitudes.get(i)),
@@ -1859,8 +1862,10 @@ public class VibratorManagerService extends IVibratorManagerService.Stub {
} else { } else {
waveform.addTransition(transitionDuration, targetAmplitude(amplitudes.get(i))); waveform.addTransition(transitionDuration, targetAmplitude(amplitudes.get(i)));
} }
if (!isContinuous) { if (!sustainDuration.isZero()) {
waveform.addSustain(Duration.ofMillis(durations.get(i))); // Add sustain only takes positive durations. Skip this since we already
// did a transition to the desired values (even when duration is zero).
waveform.addSustain(sustainDuration);
} }
if ((i > 0) && (i == repeat)) { if ((i > 0) && (i == repeat)) {