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

Merge "hasVibrator() should only report presence of built-in vibrator." into jb-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-05-03 11:56:32 -07:00
committed by Android (Google) Code Review
parent e19dbd9f9d 1064a50dc8
commit 2c6200dac2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,9 +391,15 @@ public class VibratorService extends IVibratorService.Stub
}
private boolean doVibratorExists() {
synchronized (mInputDeviceVibrators) {
return !mInputDeviceVibrators.isEmpty() || vibratorExists();
}
// For now, we choose to ignore the presence of input devices that have vibrators
// when reporting whether the device has a vibrator. Applications often use this
// information to decide whether to enable certain features so they expect the
// result of hasVibrator() to be constant. For now, just report whether
// the device has a built-in vibrator.
//synchronized (mInputDeviceVibrators) {
// return !mInputDeviceVibrators.isEmpty() || vibratorExists();
//}
return vibratorExists();
}
private void doVibratorOn(long millis) {