Merge changes I4aef89be,Ibaae6b5f (0b6543bb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/Constants.java

+54 −10

Original line number	Diff line number	Diff line
		@@ -18,11 +18,12 @@ package com.android.server.hdmi;

		import android.annotation.IntDef;
		import android.hardware.hdmi.HdmiDeviceInfo;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* Defines constants related to HDMI-CEC protocol internal implementation.
		* If a constant will be used in the public api, it should be located in
		* {@link android.hardware.hdmi.HdmiControlManager}.
		* Defines constants related to HDMI-CEC protocol internal implementation. If a constant will be
		* used in the public api, it should be located in {@link android.hardware.hdmi.HdmiControlManager}.
		*/
		final class Constants {

		@@ -180,6 +181,46 @@ final class Constants {
		static final int MENU_STATE_ACTIVATED = 0;
		static final int MENU_STATE_DEACTIVATED = 1;

		// Audio Format Codes
		// Refer to CEA Standard (CEA-861-D), Table 37 Audio Format Codes.
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({
		AUDIO_CODEC_NONE,
		AUDIO_CODEC_LPCM,
		AUDIO_CODEC_DD,
		AUDIO_CODEC_MPEG1,
		AUDIO_CODEC_MP3,
		AUDIO_CODEC_MPEG2,
		AUDIO_CODEC_AAC,
		AUDIO_CODEC_DTS,
		AUDIO_CODEC_ATRAC,
		AUDIO_CODEC_ONEBITAUDIO,
		AUDIO_CODEC_DDP,
		AUDIO_CODEC_DTSHD,
		AUDIO_CODEC_TRUEHD,
		AUDIO_CODEC_DST,
		AUDIO_CODEC_WMAPRO,
		AUDIO_CODEC_MAX,
		})
		public @interface AudioCodec {}

		static final int AUDIO_CODEC_NONE = 0x0;
		static final int AUDIO_CODEC_LPCM = 0x1; // Support LPCMs
		static final int AUDIO_CODEC_DD = 0x2; // Support DD
		static final int AUDIO_CODEC_MPEG1 = 0x3; // Support MPEG1
		static final int AUDIO_CODEC_MP3 = 0x4; // Support MP3
		static final int AUDIO_CODEC_MPEG2 = 0x5; // Support MPEG2
		static final int AUDIO_CODEC_AAC = 0x6; // Support AAC
		static final int AUDIO_CODEC_DTS = 0x7; // Support DTS
		static final int AUDIO_CODEC_ATRAC = 0x8; // Support ATRAC
		static final int AUDIO_CODEC_ONEBITAUDIO = 0x9; // Support One-Bit Audio
		static final int AUDIO_CODEC_DDP = 0xA; // Support DDP
		static final int AUDIO_CODEC_DTSHD = 0xB; // Support DTSHD
		static final int AUDIO_CODEC_TRUEHD = 0xC; // Support MLP/TRUE-HD
		static final int AUDIO_CODEC_DST = 0xD; // Support DST
		static final int AUDIO_CODEC_WMAPRO = 0xE; // Support WMA-Pro
		static final int AUDIO_CODEC_MAX = 0xF;

		// Bit mask used to get the routing path of the top level device.
		// When &'d with the path 1.2.2.0 (0x1220), for instance, gives 1.0.0.0.
		static final int ROUTING_PATH_TOP_MASK = 0xF000;
		@@ -209,6 +250,7 @@ final class Constants {
		NEVER_SYSTEM_AUDIO_CONTROL_ON_POWER_ON
		})
		@interface SystemAudioControlOnPowerOn {}

		static final int ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = 0;
		static final int USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = 1;
		static final int NEVER_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = 2;
		@@ -237,8 +279,8 @@ final class Constants {
		// TODO(UI): Set this from UI to decide if turn on System Audio Mode when power on the device
		/**
		* Property to decide if turn on the system audio control when power on the device.
		* Default is always turn on.
		* State must be a valid {@link SystemAudioControlOnPowerOn} int.
		*
		* <p>Default is always turn on. State must be a valid {@link SystemAudioControlOnPowerOn} int.
		*/
		static final String PROPERTY_SYSTEM_AUDIO_CONTROL_ON_POWER_ON =
		"persist.sys.hdmi.system_audio_control_on_power_on";
		@@ -293,5 +335,7 @@ final class Constants {
		static final int DISABLED = 0;
		static final int ENABLED = 1;

		private Constants() { /* cannot be instantiated */ }
		private Constants() {
		/* cannot be instantiated */
		}
		}