am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"

* commit '9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1': frameworks/base: unlink death notifications of Vibrate requests
2011-07-25 12:21:29 -07:00
parent ed07215e48 9ce1ecdfde
commit 6d21aee882
1 changed files with 6 additions and 0 deletions
--- a/services/java/com/android/server/VibratorService.java
+++ b/services/java/com/android/server/VibratorService.java
@@ -383,6 +383,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();
                }
            }