Merge "Turn vibrator off explicitly on waveforms when amplitude is zero"

2020-12-02 17:59:09 +00:00
parent 7a964f2199 96c18962f3
commit 240fe52811
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -1662,6 +1662,10 @@ public class VibratorService extends IVibratorService.Stub
                                    // Vibrator is already ON, so just change its amplitude.
                                    doVibratorSetAmplitude(amplitude);
                                }
+                            } else {
+                                // Previous vibration should have already finished, but we make sure
+                                // the vibrator will be off for the next step when amplitude is 0.
+                                doVibratorOff();
                            }

                            // We wait until the time this waveform step was supposed to end,