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

Commit a4cb1d9c authored by Dongwon Kang's avatar Dongwon Kang Committed by Android Git Automerger
Browse files

am c6f63593: am 3e697d71: am 734c3632: Merge "Remove COLUMN_CONDITIONAL_ACCESS... 

am c6f63593: am 3e697d71: am 734c3632: Merge "Remove COLUMN_CONDITIONAL_ACCESS from TvContract." into lmp-dev

* commit 'c6f635935536805a6f2ae4f81d96e8f44ebd97f1':
  Remove COLUMN_CONDITIONAL_ACCESS from TvContract.
parents ffa56dd5 d1f3846f

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -16822,7 +16822,6 @@ package android.media.tv { 














  public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {















    method public static final java.lang.String getVideoResolution(java.lang.String);













    field public static final java.lang.String COLUMN_CONDITIONAL_ACCESS = "conditional_access";















    field public static final java.lang.String COLUMN_DESCRIPTION = "description";















    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";















    field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";

























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



+0
−13




























Original line number
Diff line number
Diff line








@@ -695,19 +695,6 @@ public final class TvContract {













         */















        public static final String COLUMN_SEARCHABLE = "searchable";





























        /**













         * The flag indicating whether this TV channel is scrambled by conditional access or not.













         * <p>













         * This is used for indicating that this channel is protected by a conditional access













         * system. A value of 1 indicates the channel is scrambled and the user is required













         * to contact the service provider to watch this channel. A value of 0 indicates the channel













         * is not scrambled. If not specified, this value is set to 0 (not scrambled) by default.













         * </p><p>













         * Type: INTEGER (boolean)













         * </p>













         */













        public static final String COLUMN_CONDITIONAL_ACCESS = "conditional_access";





























        /**















         * The flag indicating whether this TV channel is locked or not.















         * <p>