diff --git a/manifest.xml b/manifest.xml
index c8f5b8db69d7250540c03cb4ac9d3370dae994df..192162331c5e9392a40d7409256f10a08f7ab86f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -212,15 +212,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.vibrator</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IVibrator</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl">
<name>com.fingerprints.extension</name>
<transport>hwbinder</transport>
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..7e9bf8f1f58fedbeedaf59904523c7dcd3d9c5c6
--- /dev/null
+++ b/vibrator/Android.bp
@@ -0,0 +1,42 @@
+//
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "hardware_interfaces_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_interfaces_license"],
+}
+
+cc_binary {
+ name: "android.hardware.vibrator@1.3-service.example",
+ vendor: true,
+ relative_install_path: "hw",
+ init_rc: ["android.hardware.vibrator@1.3-service.example.rc"],
+ vintf_fragments: ["android.hardware.vibrator@1.3-service.example.xml"],
+ srcs: ["service.cpp", "Vibrator.cpp"],
+ cflags: ["-Wall", "-Werror"],
+ shared_libs: [
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.1",
+ "android.hardware.vibrator@1.2",
+ "android.hardware.vibrator@1.3",
+ ],
+}
diff --git a/vibrator/OWNERS b/vibrator/OWNERS
new file mode 100644
index 0000000000000000000000000000000000000000..4b34968b9f085b322286cb45bda4e37df9010db9
--- /dev/null
+++ b/vibrator/OWNERS
@@ -0,0 +1,2 @@
+eliptus@google.com
+michaelwr@google.com
diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b5294371081d61dd37120cd07d3fe55f9d8d96e2
--- /dev/null
+++ b/vibrator/Vibrator.cpp
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "VibratorService"
+
+#include <log/log.h>
+
+#include "Vibrator.h"
+
+namespace android {
+namespace hardware {
+namespace vibrator {
+namespace V1_3 {
+namespace implementation {
+
+static constexpr uint32_t MS_PER_S = 1000;
+static constexpr uint32_t NS_PER_MS = 1000000;
+
+Vibrator::Vibrator() {
+ sigevent se{};
+ se.sigev_notify = SIGEV_THREAD;
+ se.sigev_value.sival_ptr = this;
+ se.sigev_notify_function = timerCallback;
+ se.sigev_notify_attributes = nullptr;
+
+ if (timer_create(CLOCK_REALTIME, &se, &mTimer) < 0) {
+ ALOGE("Can not create timer!%s", strerror(errno));
+ }
+}
+
+// Methods from ::android::hardware::vibrator::V1_0::IVibrator follow.
+
+Return<Status> Vibrator::on(uint32_t timeoutMs) {
+ return activate(timeoutMs);
+}
+
+Return<Status> Vibrator::off() {
+ return activate(0);
+}
+
+Return<bool> Vibrator::supportsAmplitudeControl() {
+ return true;
+}
+
+Return<Status> Vibrator::setAmplitude(uint8_t amplitude) {
+ if (!amplitude) {
+ return Status::BAD_VALUE;
+ }
+ ALOGI("Amplitude: %u -> %u\n", mAmplitude, amplitude);
+ mAmplitude = amplitude;
+ return Status::OK;
+}
+
+Return<void> Vibrator::perform(V1_0::Effect effect, EffectStrength strength, perform_cb _hidl_cb) {
+ return perform<decltype(effect)>(effect, strength, _hidl_cb);
+}
+
+// Methods from ::android::hardware::vibrator::V1_1::IVibrator follow.
+
+Return<void> Vibrator::perform_1_1(V1_1::Effect_1_1 effect, EffectStrength strength,
+ perform_cb _hidl_cb) {
+ return perform<decltype(effect)>(effect, strength, _hidl_cb);
+}
+
+// Methods from ::android::hardware::vibrator::V1_2::IVibrator follow.
+
+Return<void> Vibrator::perform_1_2(V1_2::Effect effect, EffectStrength strength,
+ perform_cb _hidl_cb) {
+ return perform<decltype(effect)>(effect, strength, _hidl_cb);
+}
+
+// Methods from ::android::hardware::vibrator::V1_3::IVibrator follow.
+
+Return<bool> Vibrator::supportsExternalControl() {
+ return true;
+}
+
+Return<Status> Vibrator::setExternalControl(bool enabled) {
+ if (mEnabled) {
+ ALOGW("Setting external control while the vibrator is enabled is unsupported!");
+ return Status::UNSUPPORTED_OPERATION;
+ } else {
+ ALOGI("ExternalControl: %s -> %s\n", mExternalControl ? "true" : "false",
+ enabled ? "true" : "false");
+ mExternalControl = enabled;
+ return Status::OK;
+ }
+}
+
+Return<void> Vibrator::perform_1_3(Effect effect, EffectStrength strength, perform_cb _hidl_cb) {
+ return perform<decltype(effect)>(effect, strength, _hidl_cb);
+}
+
+// Private methods follow.
+
+Return<void> Vibrator::perform(Effect effect, EffectStrength strength, perform_cb _hidl_cb) {
+ uint8_t amplitude;
+ uint32_t ms;
+ Status status = Status::OK;
+
+ ALOGI("Perform: Effect %s\n", effectToName(effect).c_str());
+
+ amplitude = strengthToAmplitude(strength, &status);
+ if (status != Status::OK) {
+ _hidl_cb(status, 0);
+ return Void();
+ }
+ setAmplitude(amplitude);
+
+ ms = effectToMs(effect, &status);
+ if (status != Status::OK) {
+ _hidl_cb(status, 0);
+ return Void();
+ }
+ status = activate(ms);
+
+ _hidl_cb(status, ms);
+
+ return Void();
+}
+
+template <typename T>
+Return<void> Vibrator::perform(T effect, EffectStrength strength, perform_cb _hidl_cb) {
+ auto validRange = hidl_enum_range<T>();
+ if (effect < *validRange.begin() || effect > *std::prev(validRange.end())) {
+ _hidl_cb(Status::UNSUPPORTED_OPERATION, 0);
+ return Void();
+ }
+ return perform(static_cast<Effect>(effect), strength, _hidl_cb);
+}
+
+Status Vibrator::enable(bool enabled) {
+ if (mExternalControl) {
+ ALOGW("Enabling/disabling while the vibrator is externally controlled is unsupported!");
+ return Status::UNSUPPORTED_OPERATION;
+ } else {
+ ALOGI("Enabled: %s -> %s\n", mEnabled ? "true" : "false", enabled ? "true" : "false");
+ mEnabled = enabled;
+ return Status::OK;
+ }
+}
+
+Status Vibrator::activate(uint32_t ms) {
+ std::lock_guard<std::mutex> lock{mMutex};
+ Status status = Status::OK;
+
+ if (ms > 0) {
+ status = enable(true);
+ if (status != Status::OK) {
+ return status;
+ }
+ }
+
+ itimerspec ts{};
+ ts.it_value.tv_sec = ms / MS_PER_S;
+ ts.it_value.tv_nsec = ms % MS_PER_S * NS_PER_MS;
+
+ if (timer_settime(mTimer, 0, &ts, nullptr) < 0) {
+ ALOGE("Can not set timer!");
+ status = Status::UNKNOWN_ERROR;
+ }
+
+ if ((status != Status::OK) || !ms) {
+ Status _status;
+
+ _status = enable(false);
+
+ if (status == Status::OK) {
+ status = _status;
+ }
+ }
+
+ return status;
+}
+
+void Vibrator::timeout() {
+ std::lock_guard<std::mutex> lock{mMutex};
+ itimerspec ts{};
+
+ if (timer_gettime(mTimer, &ts) < 0) {
+ ALOGE("Can not read timer!");
+ }
+
+ if (ts.it_value.tv_sec == 0 && ts.it_value.tv_nsec == 0) {
+ enable(false);
+ }
+}
+
+void Vibrator::timerCallback(union sigval sigval) {
+ static_cast<Vibrator*>(sigval.sival_ptr)->timeout();
+}
+
+const std::string Vibrator::effectToName(Effect effect) {
+ return toString(effect);
+}
+
+uint32_t Vibrator::effectToMs(Effect effect, Status* status) {
+ switch (effect) {
+ case Effect::CLICK:
+ return 10;
+ case Effect::DOUBLE_CLICK:
+ return 15;
+ case Effect::TICK:
+ case Effect::TEXTURE_TICK:
+ return 5;
+ case Effect::THUD:
+ return 5;
+ case Effect::POP:
+ return 5;
+ case Effect::HEAVY_CLICK:
+ return 10;
+ case Effect::RINGTONE_1:
+ return 30000;
+ case Effect::RINGTONE_2:
+ return 30000;
+ case Effect::RINGTONE_3:
+ return 30000;
+ case Effect::RINGTONE_4:
+ return 30000;
+ case Effect::RINGTONE_5:
+ return 30000;
+ case Effect::RINGTONE_6:
+ return 30000;
+ case Effect::RINGTONE_7:
+ return 30000;
+ case Effect::RINGTONE_8:
+ return 30000;
+ case Effect::RINGTONE_9:
+ return 30000;
+ case Effect::RINGTONE_10:
+ return 30000;
+ case Effect::RINGTONE_11:
+ return 30000;
+ case Effect::RINGTONE_12:
+ return 30000;
+ case Effect::RINGTONE_13:
+ return 30000;
+ case Effect::RINGTONE_14:
+ return 30000;
+ case Effect::RINGTONE_15:
+ return 30000;
+ }
+ *status = Status::UNSUPPORTED_OPERATION;
+ return 0;
+}
+
+uint8_t Vibrator::strengthToAmplitude(EffectStrength strength, Status* status) {
+ switch (strength) {
+ case EffectStrength::LIGHT:
+ return 128;
+ case EffectStrength::MEDIUM:
+ return 192;
+ case EffectStrength::STRONG:
+ return 255;
+ }
+ *status = Status::UNSUPPORTED_OPERATION;
+ return 0;
+}
+
+} // namespace implementation
+} // namespace V1_3
+} // namespace vibrator
+} // namespace hardware
+} // namespace android
diff --git a/vibrator/Vibrator.h b/vibrator/Vibrator.h
new file mode 100644
index 0000000000000000000000000000000000000000..518077455235f97ee1553dc6ce59212a970200b7
--- /dev/null
+++ b/vibrator/Vibrator.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ANDROID_HARDWARE_VIBRATOR_V1_3_VIBRATOR_H
+#define ANDROID_HARDWARE_VIBRATOR_V1_3_VIBRATOR_H
+
+#include <android/hardware/vibrator/1.3/IVibrator.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace vibrator {
+namespace V1_3 {
+namespace implementation {
+
+using android::hardware::vibrator::V1_0::EffectStrength;
+using android::hardware::vibrator::V1_0::Status;
+
+class Vibrator : public IVibrator {
+ public:
+ Vibrator();
+
+ // Methods from ::android::hardware::vibrator::V1_0::IVibrator follow.
+ Return<Status> on(uint32_t timeoutMs) override;
+ Return<Status> off() override;
+ Return<bool> supportsAmplitudeControl() override;
+ Return<Status> setAmplitude(uint8_t amplitude) override;
+ Return<void> perform(V1_0::Effect effect, EffectStrength strength,
+ perform_cb _hidl_cb) override;
+
+ // Methods from ::android::hardware::vibrator::V1_1::IVibrator follow.
+ Return<void> perform_1_1(V1_1::Effect_1_1 effect, EffectStrength strength,
+ perform_cb _hidl_cb) override;
+
+ // Methods from ::android::hardware::vibrator::V1_2::IVibrator follow.
+ Return<void> perform_1_2(V1_2::Effect effect, EffectStrength strength,
+ perform_cb _hidl_cb) override;
+
+ // Methods from ::android::hardware::vibrator::V1_3::IVibrator follow.
+ Return<bool> supportsExternalControl() override;
+ Return<Status> setExternalControl(bool enabled) override;
+ Return<void> perform_1_3(Effect effect, EffectStrength strength, perform_cb _hidl_cb) override;
+
+ private:
+ Return<void> perform(Effect effect, EffectStrength strength, perform_cb _hidl_cb);
+ template <typename T>
+ Return<void> perform(T effect, EffectStrength strength, perform_cb _hidl_cb);
+ Status enable(bool enabled);
+ Status activate(uint32_t ms);
+ void timeout();
+
+ static void timerCallback(union sigval sigval);
+ static const std::string effectToName(Effect effect);
+ static uint32_t effectToMs(Effect effect, Status* status);
+ static uint8_t strengthToAmplitude(EffectStrength strength, Status* status);
+
+ private:
+ bool mEnabled{false};
+ uint8_t mAmplitude{UINT8_MAX};
+ bool mExternalControl{false};
+ std::mutex mMutex;
+ timer_t mTimer{nullptr};
+};
+} // namespace implementation
+} // namespace V1_3
+} // namespace vibrator
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_VIBRATOR_V1_3_VIBRATOR_H
diff --git a/vibrator/android.hardware.vibrator@1.3-service.example.rc b/vibrator/android.hardware.vibrator@1.3-service.example.rc
new file mode 100644
index 0000000000000000000000000000000000000000..ed7a562cfcbfac2367d6df3795d4709dbfbb91b9
--- /dev/null
+++ b/vibrator/android.hardware.vibrator@1.3-service.example.rc
@@ -0,0 +1,4 @@
+service vendor.vibrator-1-3 /vendor/bin/hw/android.hardware.vibrator@1.3-service.example
+ class hal
+ user system
+ group system
diff --git a/vibrator/android.hardware.vibrator@1.3-service.example.xml b/vibrator/android.hardware.vibrator@1.3-service.example.xml
new file mode 100644
index 0000000000000000000000000000000000000000..172aa2178c975b9d6a398449f4972555dab6ac01
--- /dev/null
+++ b/vibrator/android.hardware.vibrator@1.3-service.example.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+ <hal format="hidl">
+ <name>android.hardware.vibrator</name>
+ <transport>hwbinder</transport>
+ <version>1.3</version>
+ <interface>
+ <name>IVibrator</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest>
diff --git a/vibrator/service.cpp b/vibrator/service.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..449996e2806247a451c35059f49d0e7c342785e0
--- /dev/null
+++ b/vibrator/service.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_TAG "android.hardware.vibrator@1.3-service.example"
+
+#include <android/hardware/vibrator/1.3/IVibrator.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "Vibrator.h"
+
+using android::hardware::configureRpcThreadpool;
+using android::hardware::joinRpcThreadpool;
+using android::hardware::vibrator::V1_3::IVibrator;
+using android::hardware::vibrator::V1_3::implementation::Vibrator;
+using namespace android;
+
+status_t registerVibratorService() {
+ sp<IVibrator> vibrator = new Vibrator();
+
+ return vibrator->registerAsService();
+}
+
+int main() {
+ configureRpcThreadpool(1, true);
+ status_t status = registerVibratorService();
+
+ if (status != OK) {
+ return status;
+ }
+
+ joinRpcThreadpool();
+
+ return 1;
+}