diff options
| author | Eric Laurent <elaurent@google.com> | 2015-07-08 17:24:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-08 17:24:23 +0000 |
| commit | c0344a80fdb889c2b94dcfb869edf2afc5bb60df (patch) | |
| tree | d455a26b668623bfa0ec9c53fcb51616765de88d /api | |
| parent | 4f5630e51d03980e80fde93154f5a0302c8179a2 (diff) | |
| parent | 1e725f8137391474b71ebd9109a0968ecef5373f (diff) | |
| download | frameworks_base-c0344a80fdb889c2b94dcfb869edf2afc5bb60df.zip frameworks_base-c0344a80fdb889c2b94dcfb869edf2afc5bb60df.tar.gz frameworks_base-c0344a80fdb889c2b94dcfb869edf2afc5bb60df.tar.bz2 | |
Merge "audio: add definitions for devices connected over IP" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 399c1df..af95867 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14722,6 +14722,7 @@ package android.media { field public static final int TYPE_FM_TUNER = 16; // 0x10 field public static final int TYPE_HDMI = 9; // 0x9 field public static final int TYPE_HDMI_ARC = 10; // 0xa + field public static final int TYPE_IP = 20; // 0x14 field public static final int TYPE_LINE_ANALOG = 5; // 0x5 field public static final int TYPE_LINE_DIGITAL = 6; // 0x6 field public static final int TYPE_TELEPHONY = 18; // 0x12 diff --git a/api/system-current.txt b/api/system-current.txt index e64567c..9fce166 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15961,6 +15961,7 @@ package android.media { field public static final int TYPE_FM_TUNER = 16; // 0x10 field public static final int TYPE_HDMI = 9; // 0x9 field public static final int TYPE_HDMI_ARC = 10; // 0xa + field public static final int TYPE_IP = 20; // 0x14 field public static final int TYPE_LINE_ANALOG = 5; // 0x5 field public static final int TYPE_LINE_DIGITAL = 6; // 0x6 field public static final int TYPE_TELEPHONY = 18; // 0x12 |