am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"

* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
  frameworks/base: unlink death notifications of Vibrate requests

1 files changed, 6 insertions, 0 deletions

diff --git a/services/java/com/android/server/VibratorService.java b/services/java/com/android/server/VibratorService.java
index 86c30f88a23e..71353911ea6c 100755
--- a/services/java/com/android/server/VibratorService.java
+++ b/services/java/com/android/server/VibratorService.java
@@ -379,6 +379,12 @@ public class VibratorService extends IVibratorService.Stub {
             if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
                 synchronized (mVibrations) {
                     doCancelVibrateLocked();
+
+                    int size = mVibrations.size();
+                    for(int i = 0; i < size; i++) {
+                        unlinkVibration(mVibrations.get(i));
+                    }
+
                     mVibrations.clear();
                 }
             }