Merge "Sync the constants in HAL and framework" (b567b580) · Commits · e / os / android_frameworks_base

Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -567,8 +567,9 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext

		LOCAL_STATIC_JAVA_LIBRARIES := \
		framework-protos \
		android.hardware.thermal@1.0-java-constants \
		android.hardware.health@1.0-java-constants \
		android.hardware.thermal@1.0-java-constants \
		android.hardware.tv.input@1.0-java-constants \
		android.hardware.usb@1.0-java-constants \
		android.hardware.vibrator@1.0-java-constants \

media/java/android/media/tv/TvInputHardwareInfo.java

+17 −13

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;

		import android.annotation.IntDef;
		import android.annotation.SystemApi;
		import android.hardware.tv.input.V1_0.Constants;
		import android.media.AudioManager;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -37,16 +38,16 @@ public final class TvInputHardwareInfo implements Parcelable {
		static final String TAG = "TvInputHardwareInfo";

		// Match hardware/libhardware/include/hardware/tv_input.h
		public static final int TV_INPUT_TYPE_OTHER_HARDWARE = 1;
		public static final int TV_INPUT_TYPE_TUNER = 2;
		public static final int TV_INPUT_TYPE_COMPOSITE = 3;
		public static final int TV_INPUT_TYPE_SVIDEO = 4;
		public static final int TV_INPUT_TYPE_SCART = 5;
		public static final int TV_INPUT_TYPE_COMPONENT = 6;
		public static final int TV_INPUT_TYPE_VGA = 7;
		public static final int TV_INPUT_TYPE_DVI = 8;
		public static final int TV_INPUT_TYPE_HDMI = 9;
		public static final int TV_INPUT_TYPE_DISPLAY_PORT = 10;
		public static final int TV_INPUT_TYPE_OTHER_HARDWARE = Constants.TV_INPUT_TYPE_OTHER;
		public static final int TV_INPUT_TYPE_TUNER = Constants.TV_INPUT_TYPE_TUNER;
		public static final int TV_INPUT_TYPE_COMPOSITE = Constants.TV_INPUT_TYPE_COMPOSITE;
		public static final int TV_INPUT_TYPE_SVIDEO = Constants.TV_INPUT_TYPE_SVIDEO;
		public static final int TV_INPUT_TYPE_SCART = Constants.TV_INPUT_TYPE_SCART;
		public static final int TV_INPUT_TYPE_COMPONENT = Constants.TV_INPUT_TYPE_COMPONENT;
		public static final int TV_INPUT_TYPE_VGA = Constants.TV_INPUT_TYPE_VGA;
		public static final int TV_INPUT_TYPE_DVI = Constants.TV_INPUT_TYPE_DVI;
		public static final int TV_INPUT_TYPE_HDMI = Constants.TV_INPUT_TYPE_HDMI;
		public static final int TV_INPUT_TYPE_DISPLAY_PORT = Constants.TV_INPUT_TYPE_DISPLAY_PORT;

		/** @hide */
		@Retention(SOURCE)
		@@ -58,17 +59,20 @@ public final class TvInputHardwareInfo implements Parcelable {
		/**
		* The hardware is unsure about the connection status or does not support cable detection.
		*/
		public static final int CABLE_CONNECTION_STATUS_UNKNOWN = 0;
		public static final int CABLE_CONNECTION_STATUS_UNKNOWN =
		Constants.CABLE_CONNECTION_STATUS_UNKNOWN;

		/**
		* Cable is connected to the hardware.
		*/
		public static final int CABLE_CONNECTION_STATUS_CONNECTED = 1;
		public static final int CABLE_CONNECTION_STATUS_CONNECTED =
		Constants.CABLE_CONNECTION_STATUS_CONNECTED;

		/**
		* Cable is disconnected to the hardware.
		*/
		public static final int CABLE_CONNECTION_STATUS_DISCONNECTED = 2;
		public static final int CABLE_CONNECTION_STATUS_DISCONNECTED =
		Constants.CABLE_CONNECTION_STATUS_DISCONNECTED;

		public static final Parcelable.Creator<TvInputHardwareInfo> CREATOR =
		new Parcelable.Creator<TvInputHardwareInfo>() {

services/core/java/com/android/server/tv/TvInputHal.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.server.tv;

		import android.hardware.tv.input.V1_0.Constants;
		import android.media.tv.TvInputHardwareInfo;
		import android.media.tv.TvStreamConfig;
		import android.os.Handler;
		@@ -41,9 +42,10 @@ final class TvInputHal implements Handler.Callback {
		public final static int ERROR_STALE_CONFIG = -2;
		public final static int ERROR_UNKNOWN = -3;

		public static final int EVENT_DEVICE_AVAILABLE = 1;
		public static final int EVENT_DEVICE_UNAVAILABLE = 2;
		public static final int EVENT_STREAM_CONFIGURATION_CHANGED = 3;
		public static final int EVENT_DEVICE_AVAILABLE = Constants.EVENT_DEVICE_AVAILABLE;
		public static final int EVENT_DEVICE_UNAVAILABLE = Constants.EVENT_DEVICE_UNAVAILABLE;
		public static final int EVENT_STREAM_CONFIGURATION_CHANGED =
		Constants.EVENT_STREAM_CONFIGURATIONS_CHANGED;
		public static final int EVENT_FIRST_FRAME_CAPTURED = 4;

		public interface Callback {

services/core/jni/com_android_server_tv_TvInputHal.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -577,7 +577,6 @@ JTvInputHal::TvInputCallback::TvInputCallback(JTvInputHal* hal) {
		}

		Return<void> JTvInputHal::TvInputCallback::notify(const TvInputEvent& event) {
		// TODO(b/32200867): Ensure the event type values are in sync with the framework code.
		mHal->mLooper->sendMessage(new NotifyHandler(mHal, event), static_cast<int>(event.type));
		return Void();
		}