drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
  frameworks/base: unlink death notifications of Vibrate requests
This commit is contained in:
Dianne Hackborn
2011-07-21 22:23:46 -07:00
committed by Android Git Automerger
parent e70b2b8fe0 2f4698fda4
commit 1a2fcea1a2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/VibratorService.java
View File

@ -379,6 +379,12 @@ public class VibratorService extends IVibratorService.Stub {
if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) { if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
synchronized (mVibrations) { synchronized (mVibrations) {
doCancelVibrateLocked(); doCancelVibrateLocked();
int size = mVibrations.size();
for(int i = 0; i < size; i++) {
unlinkVibration(mVibrations.get(i));
}
mVibrations.clear(); mVibrations.clear();
} }
} }