Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c6200da authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

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

parents e19dbd9f 1064a50d
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -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) {