Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21901 into eclair

Browse Source 
* changes:
  Check for a timeout <= 0 before adding the vibration.
This commit is contained in:
Android (Google) Code Review
2009-08-19 11:50:17 -07:00
parent 9303295e1d 24f1076097
commit 37e036fb81
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/HardwareService.java
View File

@@ -141,8 +141,11 @@ public class HardwareService extends IHardwareService.Stub {
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires VIBRATE permission"); throw new SecurityException("Requires VIBRATE permission");
} }
if (mCurrentVibration != null // We're running in the system server so we cannot crash. Check for a
&& mCurrentVibration.hasLongerTimeout(milliseconds)) { // timeout of 0 or negative. This will ensure that a vibration has
// either a timeout of > 0 or a non-null pattern.
if (milliseconds <= 0 || (mCurrentVibration != null
&& mCurrentVibration.hasLongerTimeout(milliseconds))) {
// Ignore this vibration since the current vibration will play for // Ignore this vibration since the current vibration will play for
// longer than milliseconds. // longer than milliseconds.
return; return;