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

Commit 3d9ecc26 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "TIF: add helper methods for making a channel browsable." into oc-dev 

am: b2eb818a

Change-Id: I54b92c8b773706de49ffd2e78df59568e19d3b49
parents 53b7ff20 b2eb818a

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -24517,14 +24517,14 @@ package android.media.tv { 
    method public static boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static boolean isChannelUriForTunerInput(android.net.Uri);

    method public static boolean isProgramUri(android.net.Uri);

    method public static void requestChannelBrowsable(android.content.Context, long);

    field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";

    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

    field public static final java.lang.String ACTION_REQUEST_CHANNEL_BROWSABLE = "android.media.tv.action.REQUEST_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED";

    field public static final java.lang.String AUTHORITY = "android.media.tv";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.media.tv.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.media.tv.extra.PACKAGE_NAME";

    field public static final java.lang.String EXTRA_PREVIEW_PROGRAM_ID = "android.media.tv.extra.PREVIEW_PROGRAM_ID";

    field public static final java.lang.String EXTRA_WATCH_NEXT_PROGRAM_ID = "android.media.tv.extra.WATCH_NEXT_PROGRAM_ID";

  }

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -26491,10 +26491,12 @@ package android.media.tv { 
    method public static boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static boolean isChannelUriForTunerInput(android.net.Uri);

    method public static boolean isProgramUri(android.net.Uri);

    method public static void requestChannelBrowsable(android.content.Context, long);

    field public static final java.lang.String ACTION_CHANNEL_BROWSABLE_REQUESTED = "android.media.tv.action.CHANNEL_BROWSABLE_REQUESTED";

    field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";

    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

    field public static final java.lang.String ACTION_REQUEST_CHANNEL_BROWSABLE = "android.media.tv.action.REQUEST_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED";

    field public static final java.lang.String AUTHORITY = "android.media.tv";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.media.tv.extra.CHANNEL_ID";

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -24624,14 +24624,14 @@ package android.media.tv { 
    method public static boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static boolean isChannelUriForTunerInput(android.net.Uri);

    method public static boolean isProgramUri(android.net.Uri);

    method public static void requestChannelBrowsable(android.content.Context, long);

    field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";

    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

    field public static final java.lang.String ACTION_REQUEST_CHANNEL_BROWSABLE = "android.media.tv.action.REQUEST_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED";

    field public static final java.lang.String AUTHORITY = "android.media.tv";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.media.tv.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.media.tv.extra.PACKAGE_NAME";

    field public static final java.lang.String EXTRA_PREVIEW_PROGRAM_ID = "android.media.tv.extra.PREVIEW_PROGRAM_ID";

    field public static final java.lang.String EXTRA_WATCH_NEXT_PROGRAM_ID = "android.media.tv.extra.WATCH_NEXT_PROGRAM_ID";

  }

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ 
    <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT" />

    <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" />

    <protected-broadcast android:name="android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED" />

    <protected-broadcast android:name="android.media.tv.action.CHANNEL_BROWSABLE_REQUESTED" />



    <!-- ====================================================================== -->

    <!--                          RUNTIME PERMISSIONS                           -->

media/java/android/media/tv/ITvInputManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ interface ITvInputManager { 
    List<DvbDeviceInfo> getDvbDeviceList();

    ParcelFileDescriptor openDvbDevice(in DvbDeviceInfo info, int device);



    // For preview programs

    // For preview channels and programs

    void sendTvInputNotifyIntent(in Intent intent, int userId);

    void requestChannelBrowsable(in Uri channelUri, int userId);

}