godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31712 from volzhs/fix-vibrate-3.1 

Suppress MissingPermission warning for Android vibration
This commit is contained in:
Rémi Verschelde 2019-08-27 17:42:24 +02:00 committed by GitHub
parent 2c63c27ef1 3178dee53c
commit 0db32ced78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/android/java/src/org/godotengine/godot/Godot.java
View File

@ -32,6 +32,7 @@ package org.godotengine.godot;
//import android.R; //import android.R;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -58,6 +59,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Messenger; import android.os.Messenger;
import android.os.VibrationEffect;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings.Secure; import android.provider.Settings.Secure;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
@ -330,14 +332,20 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
}); });
} }
@SuppressLint("MissingPermission")
public void vibrate(int p_duration_ms) { public void vibrate(int p_duration_ms) {
if (requestPermission("VIBRATE")) { if (requestPermission("VIBRATE")) {
Vibrator v = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE); Vibrator v = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
if (v != null) { if (v != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
v.vibrate(VibrationEffect.createOneShot(p_duration_ms, VibrationEffect.DEFAULT_AMPLITUDE));
} else {
//deprecated in API 26
v.vibrate(p_duration_ms); v.vibrate(p_duration_ms);
} }
} }
} }
}
public void restart() { public void restart() {
// HACK: // HACK: