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

Commit 063200b5 authored by Shubang Lu's avatar Shubang Lu Committed by Android (Google) Code Review
Browse files

Merge "TIAF: add signing request and result" into tm-dev

parents b96b2c75 553d6fb7

core/api/current.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -26135,6 +26135,7 @@ package android.media.tv.interactive { 
    field public static final String INTENT_KEY_BI_INTERACTIVE_APP_TYPE = "bi_interactive_app_type";

    field public static final String INTENT_KEY_BI_INTERACTIVE_APP_TYPE = "bi_interactive_app_type";

    field public static final String INTENT_KEY_BI_INTERACTIVE_APP_URI = "bi_interactive_app_uri";

    field public static final String INTENT_KEY_BI_INTERACTIVE_APP_URI = "bi_interactive_app_uri";

    field public static final String INTENT_KEY_CHANNEL_URI = "channel_uri";

    field public static final String INTENT_KEY_CHANNEL_URI = "channel_uri";

    field public static final String INTENT_KEY_COMMAND_TYPE = "command_type";

    field public static final String INTENT_KEY_INTERACTIVE_APP_SERVICE_ID = "interactive_app_id";

    field public static final String INTENT_KEY_INTERACTIVE_APP_SERVICE_ID = "interactive_app_id";

    field public static final String INTENT_KEY_TV_INPUT_ID = "tv_input_id";

    field public static final String INTENT_KEY_TV_INPUT_ID = "tv_input_id";

    field public static final int INTERACTIVE_APP_STATE_ERROR = 3; // 0x3

    field public static final int INTERACTIVE_APP_STATE_ERROR = 3; // 0x3
@@ -26209,6 +26210,7 @@ package android.media.tv.interactive { 
    method public abstract boolean onSetSurface(@Nullable android.view.Surface);

    method public abstract boolean onSetSurface(@Nullable android.view.Surface);

    method public void onSetTeletextAppEnabled(boolean);

    method public void onSetTeletextAppEnabled(boolean);

    method public void onSignalStrength(int);

    method public void onSignalStrength(int);

    method public void onSigningResult(@NonNull String, @NonNull byte[]);

    method public void onStartInteractiveApp();

    method public void onStartInteractiveApp();

    method public void onStopInteractiveApp();

    method public void onStopInteractiveApp();

    method public void onStreamVolume(float);

    method public void onStreamVolume(float);
@@ -26227,6 +26229,7 @@ package android.media.tv.interactive { 
    method @CallSuper public void requestCurrentChannelLcn();

    method @CallSuper public void requestCurrentChannelLcn();

    method @CallSuper public void requestCurrentChannelUri();

    method @CallSuper public void requestCurrentChannelUri();

    method @CallSuper public void requestCurrentTvInputId();

    method @CallSuper public void requestCurrentTvInputId();

    method @CallSuper public void requestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);

    method @CallSuper public void requestStreamVolume();

    method @CallSuper public void requestStreamVolume();

    method @CallSuper public void requestTrackInfoList();

    method @CallSuper public void requestTrackInfoList();

    method @CallSuper public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle);

    method @CallSuper public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle);
@@ -26268,6 +26271,7 @@ package android.media.tv.interactive { 
    method public void sendCurrentChannelLcn(int);

    method public void sendCurrentChannelLcn(int);

    method public void sendCurrentChannelUri(@Nullable android.net.Uri);

    method public void sendCurrentChannelUri(@Nullable android.net.Uri);

    method public void sendCurrentTvInputId(@Nullable String);

    method public void sendCurrentTvInputId(@Nullable String);

    method public void sendSigningResult(@NonNull String, @NonNull byte[]);

    method public void sendStreamVolume(float);

    method public void sendStreamVolume(float);

    method public void sendTrackInfoList(@Nullable java.util.List<android.media.tv.TvTrackInfo>);

    method public void sendTrackInfoList(@Nullable java.util.List<android.media.tv.TvTrackInfo>);

    method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback);

    method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback);
@@ -26276,6 +26280,9 @@ package android.media.tv.interactive { 
    method public int setTvView(@Nullable android.media.tv.TvView);

    method public int setTvView(@Nullable android.media.tv.TvView);

    method public void startInteractiveApp();

    method public void startInteractiveApp();

    method public void stopInteractiveApp();

    method public void stopInteractiveApp();

    field public static final String BI_INTERACTIVE_APP_KEY_ALIAS = "alias";

    field public static final String BI_INTERACTIVE_APP_KEY_CERTIFICATE = "certificate";

    field public static final String BI_INTERACTIVE_APP_KEY_PRIVATE_KEY = "private_key";

  }

  }

















  public static interface TvInteractiveAppView.OnUnhandledInputEventListener {







  public static interface TvInteractiveAppView.OnUnhandledInputEventListener {









@@ -26289,6 +26296,7 @@ package android.media.tv.interactive {









    method public void onRequestCurrentChannelLcn(@NonNull String);







    method public void onRequestCurrentChannelLcn(@NonNull String);











    method public void onRequestCurrentChannelUri(@NonNull String);







    method public void onRequestCurrentChannelUri(@NonNull String);











    method public void onRequestCurrentTvInputId(@NonNull String);







    method public void onRequestCurrentTvInputId(@NonNull String);














    method public void onRequestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);











    method public void onRequestStreamVolume(@NonNull String);







    method public void onRequestStreamVolume(@NonNull String);











    method public void onRequestTrackInfoList(@NonNull String);







    method public void onRequestTrackInfoList(@NonNull String);











    method public void onSetVideoBounds(@NonNull String, @NonNull android.graphics.Rect);







    method public void onSetVideoBounds(@NonNull String, @NonNull android.graphics.Rect);

























media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -44,5 +44,7 @@ oneway interface ITvInteractiveAppClient {









    void onRequestStreamVolume(int seq);







    void onRequestStreamVolume(int seq);











    void onRequestTrackInfoList(int seq);







    void onRequestTrackInfoList(int seq);











    void onRequestCurrentTvInputId(int seq);







    void onRequestCurrentTvInputId(int seq);














    void onRequestSigning(














            in String id, in String algorithm, in String alias, in byte[] data, int seq);











    void onAdRequest(in AdRequest request, int Seq);







    void onAdRequest(in AdRequest request, int Seq);











}






}
























media/java/android/media/tv/interactive/ITvInteractiveAppManager.aidl



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -50,6 +50,8 @@ interface ITvInteractiveAppManager {









    void sendStreamVolume(in IBinder sessionToken, float volume, int userId);







    void sendStreamVolume(in IBinder sessionToken, float volume, int userId);











    void sendTrackInfoList(in IBinder sessionToken, in List<TvTrackInfo> tracks, int userId);







    void sendTrackInfoList(in IBinder sessionToken, in List<TvTrackInfo> tracks, int userId);











    void sendCurrentTvInputId(in IBinder sessionToken, in String inputId, int userId);







    void sendCurrentTvInputId(in IBinder sessionToken, in String inputId, int userId);














    void sendSigningResult(in IBinder sessionToken, in String signingId, in byte[] result,














            int userId);











    void createSession(in ITvInteractiveAppClient client, in String iAppServiceId, int type,







    void createSession(in ITvInteractiveAppClient client, in String iAppServiceId, int type,











            int seq, int userId);







            int seq, int userId);











    void releaseSession(in IBinder sessionToken, int userId);







    void releaseSession(in IBinder sessionToken, int userId);

































media/java/android/media/tv/interactive/ITvInteractiveAppSession.aidl



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -42,6 +42,7 @@ oneway interface ITvInteractiveAppSession {









    void sendStreamVolume(float volume);







    void sendStreamVolume(float volume);











    void sendTrackInfoList(in List<TvTrackInfo> tracks);







    void sendTrackInfoList(in List<TvTrackInfo> tracks);











    void sendCurrentTvInputId(in String inputId);







    void sendCurrentTvInputId(in String inputId);














    void sendSigningResult(in String signingId, in byte[] result);











    void release();







    void release();











    void notifyTuned(in Uri channelUri);







    void notifyTuned(in Uri channelUri);











    void notifyTrackSelected(int type, in String trackId);







    void notifyTrackSelected(int type, in String trackId);

































media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -43,5 +43,6 @@ oneway interface ITvInteractiveAppSessionCallback {









    void onRequestStreamVolume();







    void onRequestStreamVolume();











    void onRequestTrackInfoList();







    void onRequestTrackInfoList();











    void onRequestCurrentTvInputId();







    void onRequestCurrentTvInputId();














    void onRequestSigning(in String id, in String algorithm, in String alias, in byte[] data);











    void onAdRequest(in AdRequest request);







    void onAdRequest(in AdRequest request);











}






}