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

Merge "Fixes a system crash in VibratorService on x86 hosts"

Browse Source 
am: 5ed0e55859

Change-Id: I6ad532b24ba56d7e55aead79f8d59782339d4388
This commit is contained in:
Christian Wailes
2019-10-29 15:35:54 -07:00
committed by android-build-merger
parent 000baa69f6 5ed0e55859
commit 5d8f3ae57d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/jni/com_android_server_VibratorService.cpp
View File

@@ -151,7 +151,7 @@ static void vibratorSetExternalControl(JNIEnv*, jobject, jboolean enabled) {
} }
} }
static jlong vibratorPerformEffect(JNIEnv*, jobject, jlong effect, jint strength) { static jlong vibratorPerformEffect(JNIEnv*, jobject, jlong effect, jlong strength) {
Status status; Status status;
uint32_t lengthMs; uint32_t lengthMs;
auto callback = [&status, &lengthMs](Status retStatus, uint32_t retLengthMs) { auto callback = [&status, &lengthMs](Status retStatus, uint32_t retLengthMs) {