summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorFredia Huya-Kouadio <fhuyakou@gmail.com>2021-08-21 09:25:13 -0700
committerGitHub <noreply@github.com>2021-08-21 09:25:13 -0700
commit2cfe0e5af0a803158ae75ad28e9eb5ec9f1c2a03 (patch)
treef9e0d649c0585769a3a416854122c2f6df47656c /platform
parent0a001afec53aa4caed7820b34db4d7d15686e24d (diff)
parent47f338fc128b0dfb4711689d2ab0c52c01b80514 (diff)
Merge pull request #51953 from mbrlabs/android-vibration
Check if vibration duration is > 0 on Android
Diffstat (limited to 'platform')
-rw-r--r--platform/android/java/lib/src/org/godotengine/godot/Godot.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.java b/platform/android/java/lib/src/org/godotengine/godot/Godot.java
index 2926031bcc..896b169953 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/Godot.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.java
@@ -317,7 +317,7 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
@SuppressLint("MissingPermission")
@Keep
private void vibrate(int durationMs) {
- if (requestPermission("VIBRATE")) {
+ if (durationMs > 0 && requestPermission("VIBRATE")) {
Vibrator v = (Vibrator)getContext().getSystemService(Context.VIBRATOR_SERVICE);
if (v != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {