diff options
| author | 2014-06-09 18:43:27 +0000 | |
|---|---|---|
| committer | 2014-06-09 18:43:27 +0000 | |
| commit | 085eefd1842005e388629fdcaca6832e8766ee2c (patch) | |
| tree | d1d40fa7bd96477690e9007619f518f31b9d3424 | |
| parent | cbe8e35bdae44e406476550e7c478b46931696d1 (diff) | |
| parent | f30ea53306f6f581a454e12eb71be2d8c54bd366 (diff) | |
Merge "Fix a typo in TvContract" into lmp-preview-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvContract.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index d0eb6d05b347..e4f2b9730d6f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15841,7 +15841,7 @@ package android.media.tv { field public static final int SERVICE_TYPE_OTHER = 0; // 0x0 field public static final int TYPE_1SEG = 263168; // 0x40400 field public static final int TYPE_ATSC_C = 197120; // 0x30200 - field public static final int TYPE_ATSC_M_H = 197120; // 0x30200 + field public static final int TYPE_ATSC_M_H = 197376; // 0x30300 field public static final int TYPE_ATSC_T = 196608; // 0x30000 field public static final int TYPE_CMMB = 327936; // 0x50100 field public static final int TYPE_DTMB = 327680; // 0x50000 diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 5e650c2373f6..52045d374b73 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -306,7 +306,7 @@ public final class TvContract { public static final int TYPE_ATSC_C = 0x00030200; /** The channel type for ATSC-M/H (mobile/handheld). */ - public static final int TYPE_ATSC_M_H = 0x00030200; + public static final int TYPE_ATSC_M_H = 0x00030300; /** The channel type for ISDB-T (terrestrial). */ public static final int TYPE_ISDB_T = 0x00040000; |