Merge "Remove vibrator@1.4" am: 716868f7fd am: eec11626a9 (69472910) · Commits · e / os / android_hardware_interfaces

vibrator/1.4/Android.bp

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		hidl_interface {
		name: "android.hardware.vibrator@1.4",
		root: "android.hardware",
		srcs: [
		"types.hal",
		"IVibrator.hal",
		"IVibratorCallback.hal",
		],
		interfaces: [
		"android.hardware.vibrator@1.0",
		"android.hardware.vibrator@1.1",
		"android.hardware.vibrator@1.2",
		"android.hardware.vibrator@1.3",
		"android.hidl.base@1.0",
		],
		gen_java: true,
		}

vibrator/1.4/IVibrator.hal

deleted100644 → 0

+0 −57

Original line number	Diff line number	Diff line
		/*
		* 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 android.hardware.vibrator@1.4;

		import @1.0::EffectStrength;
		import @1.3::Effect;
		import @1.0::Status;
		import @1.3::IVibrator;
		import IVibratorCallback;

		interface IVibrator extends @1.3::IVibrator {
		/**
		* Determine capabilities of the vibrator HAL.
		*/
		getCapabilities() generates (bitfield<Capabilities> capabilities);

		/**
		* Turn on vibrator
		*
		* This function must only be called after the previous timeout has expired or
		* was canceled (through off()).
		* @param timeoutMs number of milliseconds to vibrate.
		* @param callback A callback used to inform Frameworks of state change, if supported.
		* @return vibratorOnRet whether vibrator command was successful or not.
		*/
		on_1_4(uint32_t timeoutMs, IVibratorCallback callback) generates (Status vibratorOnRet);

		/**
		* Fire off a predefined haptic event.
		*
		* @param effect The type of haptic event to trigger.
		* @param strength The intensity of haptic event to trigger.
		* @param callback A callback used to inform Frameworks of state change, if supported.
		* @return status Whether the effect was successfully performed or not. Must
		* return Status::UNSUPPORTED_OPERATION if the effect is not supported.
		* @return lengthMs The length of time the event is expected to take in
		* milliseconds. This doesn't need to be perfectly accurate, but should be a reasonable
		* approximation. Should be a positive, non-zero value if the returned status is Status::OK,
		* and set to 0 otherwise.
		*/
		perform_1_4(Effect effect, EffectStrength strength, IVibratorCallback callback)
		generates (Status status, uint32_t lengthMs);
		};

vibrator/1.4/IVibratorCallback.hal

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		/*
		* 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 android.hardware.vibrator@1.4;

		interface IVibratorCallback {
		oneway onComplete();
		};

vibrator/1.4/types.hal

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		/*
		* 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 android.hardware.vibrator@1.4;

		enum Capabilities : uint32_t {
		ON_COMPLETION_CALLBACK = 1 << 0,
		PERFORM_COMPLETION_CALLBACK = 1 << 1,
		};

vibrator/1.4/vts/functional/Android.bp

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		//
		// 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.
		//

		cc_test {
		name: "VtsHalVibratorV1_4TargetTest",
		defaults: ["VtsHalTargetTestDefaults"],
		srcs: ["VtsHalVibratorV1_4TargetTest.cpp"],
		static_libs: [
		"android.hardware.vibrator@1.0",
		"android.hardware.vibrator@1.1",
		"android.hardware.vibrator@1.2",
		"android.hardware.vibrator@1.3",
		"android.hardware.vibrator@1.4",
		],
		test_suites: [
		"general-tests",
		"vts-core",
		],
		}