Merge changes from topic "rm-vibrator-1-4" (5aca9f6f) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -476,7 +476,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.vibrator</name>
		<version>1.0-4</version>
		<version>1.0-3</version>
		<interface>
		<name>IVibrator</name>
		<instance>default</instance>

current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -591,9 +591,6 @@ ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardwar
		db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types
		34515afa2bb792d3c6d8495a5f5d907d179c8507ca5e55c10050d02ae1d516ef android.hardware.neuralnetworks@1.3::IDevice
		b74fe72cfe438f50e772e6a307657ff449d5bde83c15dd1f140ff2edbe73499c android.hardware.neuralnetworks@1.3::types
		544049dcda3f943ad67d83d5277f06681a3782982a9af5a78b5d4e8d295d061a android.hardware.vibrator@1.4::IVibrator
		5e1c12efbbba89c9143d10b1b90eceff8bc79aa079f5106215b528e104fef101 android.hardware.vibrator@1.4::IVibratorCallback
		033eae03c09ebc75e82db37bc39995dfaa9086745577b44d9e14e9ccb48bd8cc android.hardware.vibrator@1.4::types
		41c602462ccd1b19cfd645994be4de4c07fc197ff58a54e84476b31908e61e21 android.hardware.radio@1.5::types
		a8691c71747c3f14f7a043598e856425077f755e55990507a9132ad62f8ab3f7 android.hardware.radio@1.5::IRadio
		a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication

vibrator/1.x/example/Android.bp→vibrator/1.3/example/Android.bp

+3 −4

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@
		// limitations under the License.

		cc_binary {
		name: "android.hardware.vibrator@1.x-service.example",
		name: "android.hardware.vibrator@1.3-service.example",
		vendor: true,
		relative_install_path: "hw",
		init_rc: ["android.hardware.vibrator@1.x-service.example.rc"],
		vintf_fragments: ["android.hardware.vibrator@1.x-service.example.xml"],
		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: [
		@@ -29,6 +29,5 @@ cc_binary {
		"android.hardware.vibrator@1.1",
		"android.hardware.vibrator@1.2",
		"android.hardware.vibrator@1.3",
		"android.hardware.vibrator@1.4",
		],
		}

vibrator/1.x/example/OWNERS→vibrator/1.3/example/OWNERS

+0 −0

File moved.

View file

vibrator/1.x/example/Vibrator.cpp→vibrator/1.3/example/Vibrator.cpp

+3 −29

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		namespace android {
		namespace hardware {
		namespace vibrator {
		namespace V1_4 {
		namespace V1_3 {
		namespace implementation {

		static constexpr uint32_t MS_PER_S = 1000;
		@@ -100,25 +100,7 @@ Return<Status> Vibrator::setExternalControl(bool enabled) {
		}
		}

		Return<void> Vibrator::perform_1_3(V1_3::Effect effect, EffectStrength strength,
		perform_cb _hidl_cb) {
		return perform<decltype(effect)>(effect, strength, _hidl_cb);
		}

		// Methods from ::android::hardware::vibrator::V1_4::IVibrator follow.

		Return<hidl_bitfield<Capabilities>> Vibrator::getCapabilities() {
		return Capabilities::ON_COMPLETION_CALLBACK \| Capabilities::PERFORM_COMPLETION_CALLBACK;
		}

		Return<Status> Vibrator::on_1_4(uint32_t timeoutMs, const sp<IVibratorCallback>& callback) {
		mCallback = callback;
		return on(timeoutMs);
		}

		Return<void> Vibrator::perform_1_4(V1_3::Effect effect, EffectStrength strength,
		const sp<IVibratorCallback>& callback, perform_cb _hidl_cb) {
		mCallback = callback;
		Return<void> Vibrator::perform_1_3(Effect effect, EffectStrength strength, perform_cb _hidl_cb) {
		return perform<decltype(effect)>(effect, strength, _hidl_cb);
		}

		@@ -166,14 +148,6 @@ Status Vibrator::enable(bool enabled) {
		return Status::UNSUPPORTED_OPERATION;
		} else {
		ALOGI("Enabled: %s -> %s\n", mEnabled ? "true" : "false", enabled ? "true" : "false");
		if (mEnabled && !enabled) {
		if (auto callback = mCallback) {
		mCallback = nullptr;
		if (auto ret = callback->onComplete(); !ret.isOk()) {
		ALOGE("Failed completion callback: %s", ret.description().c_str());
		}
		}
		}
		mEnabled = enabled;
		return Status::OK;
		}
		@@ -297,7 +271,7 @@ uint8_t Vibrator::strengthToAmplitude(EffectStrength strength, Status* status) {
		}

		} // namespace implementation
		} // namespace V1_4
		} // namespace V1_3
		} // namespace vibrator
		} // namespace hardware
		} // namespace android