diff options
-rw-r--r-- | api/current.txt | 175 | ||||
-rw-r--r-- | core/java/android/content/Context.java | 3 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiCec.java | 5 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiCecDeviceInfo.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiCecMessage.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiControlManager.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiHotplugEvent.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiPlaybackClient.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiTvClient.java | 5 |
9 files changed, 33 insertions, 175 deletions
diff --git a/api/current.txt b/api/current.txt index c6f9755..012f979 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7019,7 +7019,6 @@ package android.content { field public static final java.lang.String DOWNLOAD_SERVICE = "download"; field public static final java.lang.String DROPBOX_SERVICE = "dropbox"; field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint"; - field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control"; field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method"; field public static final java.lang.String INPUT_SERVICE = "input"; field public static final java.lang.String KEYGUARD_SERVICE = "keyguard"; @@ -12821,180 +12820,6 @@ package android.hardware.display { } -package android.hardware.hdmi { - - public final class HdmiCec { - method public static java.lang.String getDefaultDeviceName(int); - method public static int getTypeFromAddress(int); - method public static boolean isValidAddress(int); - method public static boolean isValidType(int); - field public static final int ADDR_AUDIO_SYSTEM = 5; // 0x5 - field public static final int ADDR_BROADCAST = 15; // 0xf - field public static final int ADDR_INVALID = -1; // 0xffffffff - field public static final int ADDR_PLAYBACK_1 = 4; // 0x4 - field public static final int ADDR_PLAYBACK_2 = 8; // 0x8 - field public static final int ADDR_PLAYBACK_3 = 11; // 0xb - field public static final int ADDR_RECORDER_1 = 1; // 0x1 - field public static final int ADDR_RECORDER_2 = 2; // 0x2 - field public static final int ADDR_RECORDER_3 = 9; // 0x9 - field public static final int ADDR_RESERVED_1 = 12; // 0xc - field public static final int ADDR_RESERVED_2 = 13; // 0xd - field public static final int ADDR_SPECIFIC_USE = 14; // 0xe - field public static final int ADDR_TUNER_1 = 3; // 0x3 - field public static final int ADDR_TUNER_2 = 6; // 0x6 - field public static final int ADDR_TUNER_3 = 7; // 0x7 - field public static final int ADDR_TUNER_4 = 10; // 0xa - field public static final int ADDR_TV = 0; // 0x0 - field public static final int ADDR_UNREGISTERED = 15; // 0xf - field public static final int DEVICE_AUDIO_SYSTEM = 5; // 0x5 - field public static final int DEVICE_INACTIVE = -1; // 0xffffffff - field public static final int DEVICE_PLAYBACK = 4; // 0x4 - field public static final int DEVICE_RECORDER = 1; // 0x1 - field public static final int DEVICE_RESERVED = 2; // 0x2 - field public static final int DEVICE_TUNER = 3; // 0x3 - field public static final int DEVICE_TV = 0; // 0x0 - field public static final int MESSAGE_ABORT = 255; // 0xff - field public static final int MESSAGE_ACTIVE_SOURCE = 130; // 0x82 - field public static final int MESSAGE_CEC_VERSION = 158; // 0x9e - field public static final int MESSAGE_CLEAR_ANALOG_TIMER = 51; // 0x33 - field public static final int MESSAGE_CLEAR_DIGITAL_TIMER = 153; // 0x99 - field public static final int MESSAGE_CLEAR_EXTERNAL_TIMER = 161; // 0xa1 - field public static final int MESSAGE_DECK_CONTROL = 66; // 0x42 - field public static final int MESSAGE_DECK_STATUS = 27; // 0x1b - field public static final int MESSAGE_DEVICE_VENDOR_ID = 135; // 0x87 - field public static final int MESSAGE_FEATURE_ABORT = 0; // 0x0 - field public static final int MESSAGE_GET_CEC_VERSION = 159; // 0x9f - field public static final int MESSAGE_GET_MENU_LANGUAGE = 145; // 0x91 - field public static final int MESSAGE_GIVE_AUDIO_STATUS = 113; // 0x71 - field public static final int MESSAGE_GIVE_DECK_STATUS = 26; // 0x1a - field public static final int MESSAGE_GIVE_DEVICE_POWER_STATUS = 143; // 0x8f - field public static final int MESSAGE_GIVE_DEVICE_VENDOR_ID = 140; // 0x8c - field public static final int MESSAGE_GIVE_OSD_NAME = 70; // 0x46 - field public static final int MESSAGE_GIVE_PHYSICAL_ADDRESS = 131; // 0x83 - field public static final int MESSAGE_GIVE_SYSTEM_AUDIO_MODE_STATUS = 125; // 0x7d - field public static final int MESSAGE_GIVE_TUNER_DEVICE_STATUS = 8; // 0x8 - field public static final int MESSAGE_IMAGE_VIEW_ON = 4; // 0x4 - field public static final int MESSAGE_INACTIVE_SOURCE = 157; // 0x9d - field public static final int MESSAGE_INITIATE_ARC = 192; // 0xc0 - field public static final int MESSAGE_MENU_REQUEST = 141; // 0x8d - field public static final int MESSAGE_MENU_STATUS = 142; // 0x8e - field public static final int MESSAGE_PLAY = 65; // 0x41 - field public static final int MESSAGE_RECORD_OFF = 11; // 0xb - field public static final int MESSAGE_RECORD_ON = 9; // 0x9 - field public static final int MESSAGE_RECORD_STATUS = 10; // 0xa - field public static final int MESSAGE_RECORD_TV_SCREEN = 15; // 0xf - field public static final int MESSAGE_REPORT_ARC_INITIATED = 193; // 0xc1 - field public static final int MESSAGE_REPORT_ARC_TERMINATED = 194; // 0xc2 - field public static final int MESSAGE_REPORT_AUDIO_STATUS = 122; // 0x7a - field public static final int MESSAGE_REPORT_PHYSICAL_ADDRESS = 132; // 0x84 - field public static final int MESSAGE_REPORT_POWER_STATUS = 144; // 0x90 - field public static final int MESSAGE_REQUEST_ACTIVE_SOURCE = 133; // 0x85 - field public static final int MESSAGE_REQUEST_ARC_INITIATION = 195; // 0xc3 - field public static final int MESSAGE_REQUEST_ARC_TERMINATION = 196; // 0xc4 - field public static final int MESSAGE_ROUTING_CHANGE = 128; // 0x80 - field public static final int MESSAGE_ROUTING_INFORMATION = 129; // 0x81 - field public static final int MESSAGE_SELECT_ANALOG_SERVICE = 146; // 0x92 - field public static final int MESSAGE_SELECT_DIGITAL_SERVICE = 147; // 0x93 - field public static final int MESSAGE_SET_ANALOG_TIMER = 52; // 0x34 - field public static final int MESSAGE_SET_AUDIO_RATE = 154; // 0x9a - field public static final int MESSAGE_SET_DIGITAL_TIMER = 151; // 0x97 - field public static final int MESSAGE_SET_EXTERNAL_TIMER = 162; // 0xa2 - field public static final int MESSAGE_SET_MENU_LANGUAGE = 50; // 0x32 - field public static final int MESSAGE_SET_OSD_NAME = 71; // 0x47 - field public static final int MESSAGE_SET_OSD_STRING = 100; // 0x64 - field public static final int MESSAGE_SET_STREAM_PATH = 134; // 0x86 - field public static final int MESSAGE_SET_SYSTEM_AUDIO_MODE = 114; // 0x72 - field public static final int MESSAGE_SET_TIMER_PROGRAM_TITLE = 103; // 0x67 - field public static final int MESSAGE_STANDBY = 54; // 0x36 - field public static final int MESSAGE_SYSTEM_AUDIO_MODE_REQUEST = 112; // 0x70 - field public static final int MESSAGE_SYSTEM_AUDIO_MODE_STATUS = 126; // 0x7e - field public static final int MESSAGE_TERMINATE_ARC = 197; // 0xc5 - field public static final int MESSAGE_TEXT_VIEW_ON = 13; // 0xd - field public static final int MESSAGE_TIMER_CLEARED_STATUS = 67; // 0x43 - field public static final int MESSAGE_TIMER_STATUS = 53; // 0x35 - field public static final int MESSAGE_TUNER_DEVICE_STATUS = 7; // 0x7 - field public static final int MESSAGE_TUNER_STEP_DECREMENT = 6; // 0x6 - field public static final int MESSAGE_TUNER_STEP_INCREMENT = 5; // 0x5 - field public static final int MESSAGE_USER_CONTROL_PRESSED = 68; // 0x44 - field public static final int MESSAGE_USER_CONTROL_RELEASED = 69; // 0x45 - field public static final int MESSAGE_VENDOR_COMMAND = 137; // 0x89 - field public static final int MESSAGE_VENDOR_COMMAND_WITH_ID = 160; // 0xa0 - field public static final int MESSAGE_VENDOR_REMOTE_BUTTON_DOWN = 138; // 0x8a - field public static final int MESSAGE_VENDOR_REMOTE_BUTTON_UP = 139; // 0x8b - field public static final int POWER_STATUS_ON = 0; // 0x0 - field public static final int POWER_STATUS_STANDBY = 1; // 0x1 - field public static final int POWER_STATUS_TRANSIENT_TO_ON = 2; // 0x2 - field public static final int POWER_STATUS_TRANSIENT_TO_STANDBY = 3; // 0x3 - field public static final int POWER_STATUS_UNKNOWN = -1; // 0xffffffff - field public static final int RESULT_ALREADY_IN_PROGRESS = 4; // 0x4 - field public static final int RESULT_EXCEPTION = 5; // 0x5 - field public static final int RESULT_SOURCE_NOT_AVAILABLE = 2; // 0x2 - field public static final int RESULT_SUCCESS = 0; // 0x0 - field public static final int RESULT_TARGET_NOT_AVAILABLE = 3; // 0x3 - field public static final int RESULT_TIMEOUT = 1; // 0x1 - field public static final int UNKNOWN_VENDOR_ID = 16777215; // 0xffffff - } - - public final class HdmiCecDeviceInfo implements android.os.Parcelable { - method public int describeContents(); - method public int getDeviceType(); - method public java.lang.String getDisplayName(); - method public int getLogicalAddress(); - method public int getPhysicalAddress(); - method public int getVendorId(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - - public final class HdmiCecMessage implements android.os.Parcelable { - ctor public HdmiCecMessage(int, int, int, byte[]); - method public int describeContents(); - method public int getDestination(); - method public int getOpcode(); - method public byte[] getParams(); - method public int getSource(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final byte[] EMPTY_PARAM; - } - - public final class HdmiControlManager { - method public void addHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener); - method public android.hardware.hdmi.HdmiPlaybackClient getPlaybackClient(); - method public android.hardware.hdmi.HdmiTvClient getTvClient(); - method public void removeHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener); - } - - public static abstract interface HdmiControlManager.HotplugEventListener { - method public abstract void onReceived(android.hardware.hdmi.HdmiHotplugEvent); - } - - public final class HdmiHotplugEvent implements android.os.Parcelable { - method public int describeContents(); - method public int getPort(); - method public boolean isConnected(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - - public final class HdmiPlaybackClient { - method public void oneTouchPlay(android.hardware.hdmi.HdmiPlaybackClient.OneTouchPlayCallback); - method public void queryDisplayStatus(android.hardware.hdmi.HdmiPlaybackClient.DisplayStatusCallback); - } - - public static abstract interface HdmiPlaybackClient.DisplayStatusCallback { - method public abstract void onComplete(int); - } - - public static abstract interface HdmiPlaybackClient.OneTouchPlayCallback { - method public abstract void onComplete(int); - } - - public final class HdmiTvClient { - } - -} - package android.hardware.input { public final class InputManager { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 1cf661f..2897887 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -20,6 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringDef; +import android.annotation.SystemApi; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.AssetManager; @@ -2640,7 +2641,9 @@ public abstract class Context { * * @see #getSystemService * @see android.hardware.hdmi.HdmiControlManager + * @hide */ + @SystemApi public static final String HDMI_CONTROL_SERVICE = "hdmi_control"; /** diff --git a/core/java/android/hardware/hdmi/HdmiCec.java b/core/java/android/hardware/hdmi/HdmiCec.java index 723eda1..8ad9463 100644 --- a/core/java/android/hardware/hdmi/HdmiCec.java +++ b/core/java/android/hardware/hdmi/HdmiCec.java @@ -16,9 +16,14 @@ package android.hardware.hdmi; +import android.annotation.SystemApi; + /** * Defines constants and utility methods related to HDMI-CEC protocol. + * + * @hide */ +@SystemApi public final class HdmiCec { /** TV device type. */ diff --git a/core/java/android/hardware/hdmi/HdmiCecDeviceInfo.java b/core/java/android/hardware/hdmi/HdmiCecDeviceInfo.java index 9698445..fbfcca0 100644 --- a/core/java/android/hardware/hdmi/HdmiCecDeviceInfo.java +++ b/core/java/android/hardware/hdmi/HdmiCecDeviceInfo.java @@ -16,6 +16,7 @@ package android.hardware.hdmi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -23,7 +24,10 @@ import android.os.Parcelable; * A class to encapsulate device information for HDMI-CEC. This container * include basic information such as logical address, physical address and * device type, and additional information like vendor id and osd name. + * + * @hide */ +@SystemApi public final class HdmiCecDeviceInfo implements Parcelable { // Logical address, phsical address, device type, vendor id and display name // are immutable value. diff --git a/core/java/android/hardware/hdmi/HdmiCecMessage.java b/core/java/android/hardware/hdmi/HdmiCecMessage.java index 62fa279..ac16ad8 100644 --- a/core/java/android/hardware/hdmi/HdmiCecMessage.java +++ b/core/java/android/hardware/hdmi/HdmiCecMessage.java @@ -16,6 +16,7 @@ package android.hardware.hdmi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -27,7 +28,10 @@ import java.util.Arrays; * A class to encapsulate HDMI-CEC message used for the devices connected via * HDMI cable to communicate with one another. A message is defined by its * source and destination address, command (or opcode), and optional parameters. + * + * @hide */ +@SystemApi public final class HdmiCecMessage implements Parcelable { public static final byte[] EMPTY_PARAM = EmptyArray.BYTE; diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index 5b6e862..f15fa00 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -17,6 +17,7 @@ package android.hardware.hdmi; import android.annotation.Nullable; +import android.annotation.SystemApi; import android.os.RemoteException; /** @@ -28,7 +29,10 @@ import android.os.RemoteException; * {@link HdmiTvClient} object if the system is configured to host one. Android system * can host more than one logical CEC devices. If multiple types are configured they * all work as if they were independent logical devices running in the system. + * + * @hide */ +@SystemApi public final class HdmiControlManager { @Nullable private final IHdmiControlService mService; diff --git a/core/java/android/hardware/hdmi/HdmiHotplugEvent.java b/core/java/android/hardware/hdmi/HdmiHotplugEvent.java index 1462f83..7be4bc5 100644 --- a/core/java/android/hardware/hdmi/HdmiHotplugEvent.java +++ b/core/java/android/hardware/hdmi/HdmiHotplugEvent.java @@ -16,12 +16,16 @@ package android.hardware.hdmi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; /** * A class that describes the HDMI port hotplug event. + * + * @hide */ +@SystemApi public final class HdmiHotplugEvent implements Parcelable { private final int mPort; diff --git a/core/java/android/hardware/hdmi/HdmiPlaybackClient.java b/core/java/android/hardware/hdmi/HdmiPlaybackClient.java index f0bd237..2e49a38 100644 --- a/core/java/android/hardware/hdmi/HdmiPlaybackClient.java +++ b/core/java/android/hardware/hdmi/HdmiPlaybackClient.java @@ -16,6 +16,7 @@ package android.hardware.hdmi; +import android.annotation.SystemApi; import android.os.RemoteException; import android.util.Log; @@ -25,7 +26,10 @@ import android.util.Log; * in the Android system which acts as a playback device such as set-top box. * It provides with methods that control, get information from TV/Display device * connected through HDMI bus. + * + * @hide */ +@SystemApi public final class HdmiPlaybackClient { private static final String TAG = "HdmiPlaybackClient"; diff --git a/core/java/android/hardware/hdmi/HdmiTvClient.java b/core/java/android/hardware/hdmi/HdmiTvClient.java index 73c7247..6dc4a4f 100644 --- a/core/java/android/hardware/hdmi/HdmiTvClient.java +++ b/core/java/android/hardware/hdmi/HdmiTvClient.java @@ -15,11 +15,16 @@ */ package android.hardware.hdmi; +import android.annotation.SystemApi; + /** * HdmiTvClient represents HDMI-CEC logical device of type TV in the Android system * which acts as TV/Display. It provides with methods that manage, interact with other * devices on the CEC bus. + * + * @hide */ +@SystemApi public final class HdmiTvClient { private static final String TAG = "HdmiTvClient"; |