Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87991796 authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 

* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
parents 7fc1e221 085eefd1

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15975,7 +15975,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

media/java/android/media/tv/TvContract.java

+1 −1
Original line number Diff line number Diff line
@@ -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;