diff options
| author | 2015-01-23 08:27:29 +0000 | |
|---|---|---|
| committer | 2015-01-23 08:27:29 +0000 | |
| commit | 7127d264d1489c5fae528ef1ca8d3b21d0eba519 (patch) | |
| tree | 0e77d2aa2b435dd0e20b34ba7e8625cbc01f7493 | |
| parent | f6483ac5156d369c509ad0f8b1da03d059be29f7 (diff) | |
| parent | 304f696b34592d0eb75339da91a71864884322c1 (diff) | |
am 3379c1cb: Fix broken build automerge: 2652c57
automerge: 304f696
* commit '304f696b34592d0eb75339da91a71864884322c1':
Fix broken build
| -rw-r--r-- | api/system-current.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index ae733a20bbc3..ba19bdfa86e1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -13648,6 +13648,7 @@ package android.hardware.hdmi { } public class HdmiDeviceInfo implements android.os.Parcelable { + ctor public HdmiDeviceInfo(); method public int describeContents(); method public int getAdopterId(); method public int getDeviceId(); @@ -13663,6 +13664,7 @@ package android.hardware.hdmi { method public static int idForHardware(int); method public static int idForMhlDevice(int); method public boolean isCecDevice(); + method public boolean isInactivated(); method public boolean isMhlDevice(); method public boolean isSourceType(); method public void writeToParcel(android.os.Parcel, int); @@ -13675,6 +13677,8 @@ package android.hardware.hdmi { 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 ID_INVALID = 65535; // 0xffff + field public static final android.hardware.hdmi.HdmiDeviceInfo INACTIVE_DEVICE; field public static final int PATH_INTERNAL = 0; // 0x0 field public static final int PATH_INVALID = 65535; // 0xffff field public static final int PORT_INVALID = -1; // 0xffffffff |