Merge "Sync the constants in HAL and framework" (827fac69) · Commits · e / os / android_hardware_interfaces

tv/input/1.0/Android.mk

+38 −16

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2016 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.
		#
		# This file is autogenerated by hidl-gen. Do not edit manually.

		LOCAL_PATH := $(call my-dir)

		include $(call all-subdir-makefiles)
		################################################################################

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.tv.input@1.0-java-constants
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		intermediates := $(call local-generated-sources-dir, COMMON)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
		#
		GEN := $(intermediates)/android/hardware/tv/input/V1_0/Constants.java
		$(GEN): $(HIDL)
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/ITvInput.hal
		$(GEN): $(LOCAL_PATH)/ITvInputCallback.hal

		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava-constants \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.tv.input@1.0

		$(GEN):
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
		LOCAL_NO_STANDARD_LIBRARIES := true
		LOCAL_JAVA_LIBRARIES := core-oj

		include $(BUILD_STATIC_JAVA_LIBRARY)



		include $(call all-makefiles-under,$(LOCAL_PATH))

tv/input/1.0/default/TvInput.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@

		#include "TvInput.h"

		const native_handle_t kNullNativeHandle{sizeof(native_handle_t), 0, 0, {}};

		namespace android {
		namespace hardware {
		namespace tv {
		@@ -117,8 +115,6 @@ Return<void> TvInput::openStream(int32_t deviceId, int32_t streamId, openStream_
		sidebandStream = stream.sideband_stream_source_handle;
		}
		} else {
		// TODO(b/30814137)
		sidebandStream = const_cast<native_handle_t*>(&kNullNativeHandle);
		if (ret == -EBUSY) {
		res = Result::NO_RESOURCE;
		} else if (ret == -EEXIST) {

tv/input/1.0/types.hal

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ enum Result : int32_t {
		};

		/* Type of physical TV input. */
		@export(name="", value_prefix="TV_INPUT_TYPE_")
		enum TvInputType : int32_t {
		OTHER = 1, // Generic hardware.
		TUNER = 2, // Tuner. e.g. built-in terrestrial tuner
		@@ -46,6 +47,7 @@ enum TvInputType : int32_t {
		* regardless of whether the connected external device is electrically on or not.
		* If the device does not have such capability, you must use UNKNOWN.
		*/
		@export(name="", value_prefix="CABLE_CONNECTION_STATUS_")
		enum CableConnectionStatus : int32_t {
		UNKNOWN = 0,
		CONNECTED = 1,
		@@ -63,6 +65,7 @@ struct TvInputDeviceInfo {
		// must be filled with 0s.
		};

		@export(name="", value_prefix="EVENT_")
		enum TvInputEventType : int32_t {
		/*
		* Hardware notifies the framework that a device is available.