Merge "Fix PWLE v2 effect durations" into main (a42aeb70) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_vibrator_VibratorController.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -435,8 +435,8 @@ static jlong vibratorPerformPwleV2Effect(JNIEnv* env, jclass /* clazz */, jlong
	auto composePwleV2Fn = [&composite, &callback](vibrator::HalWrapper* hal) {		auto composePwleV2Fn = [&composite, &callback](vibrator::HalWrapper* hal) {
	return hal->composePwleV2(composite, callback);		return hal->composePwleV2(composite, callback);
	};		};
	auto result = wrapper->halCall<void>(composePwleV2Fn, "composePwleV2");		auto result = wrapper->halCall<std::chrono::milliseconds>(composePwleV2Fn, "composePwleV2");
	return result.isOk();		return result.isOk() ? result.value().count() : (result.isUnsupported() ? 0 : -1);
	}		}

	static void vibratorAlwaysOnEnable(JNIEnv* env, jclass /* clazz */, jlong ptr, jlong id,		static void vibratorAlwaysOnEnable(JNIEnv* env, jclass /* clazz */, jlong ptr, jlong id,