commit f86411654ec317a6757d5b278b38b4e82c3423b2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 02 19:04:09 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 02 19:04:09 2020 +0000
tree 2180a2c6bf4801b78d18fcb3911c1ded0fc62948
parent 240fe528117c4a07399baa8010d0f98807b62782
parent a80891bebef9d536ab743f8aaf8254097e15f7dc

Merge "Make auto time source suggestions prioritisation configurable."

services/core/java/com/android/server/VibratorService.java

diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index 0ee30f9..9340be1 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -1662,6 +1662,10 @@
                                     // 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,