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

Commit d529dfc8 authored by Chulwoo Lee's avatar Chulwoo Lee Committed by android-build-merger
Browse files

Merge "Add TYPE_PREVIEW in the javadoc of Channels.COLUMN_TYPE" into oc-dev am: 0a198d10 

am: b1cd4c54

Change-Id: I976ef410f41cce40fc12ea6d2d76c2860ce112d8
parents 553ae6e7 b1cd4c54

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

+3 −2
Original line number Diff line number Diff line
@@ -1802,8 +1802,9 @@ public final class TvContract { 
         * {@link #TYPE_OTHER},

         * {@link #TYPE_PAL},

         * {@link #TYPE_SECAM},

         * {@link #TYPE_S_DMB}, and

         * {@link #TYPE_T_DMB}.

         * {@link #TYPE_S_DMB},

         * {@link #TYPE_T_DMB}, and

         * {@link #TYPE_PREVIEW}.

         *

         * <p>This value cannot be changed once it's set. Trying to modify it will make the update

         * fail.