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

Commit 5d8f3ae5 authored by Christian Wailes's avatar Christian Wailes Committed by android-build-merger
Browse files

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

am: 5ed0e558

Change-Id: I6ad532b24ba56d7e55aead79f8d59782339d4388
parents 000baa69 5ed0e558

services/core/jni/com_android_server_VibratorService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    uint32_t lengthMs;

    auto callback = [&status, &lengthMs](Status retStatus, uint32_t retLengthMs) {