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

Commit eb2a6720 authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17214908

Change-Id: I9f424dbadd4ea39f2bb7e2587b97b69dfecb40d5
parents cf0e2360 063200b5

core/api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -26136,6 +26136,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_URI = "bi_interactive_app_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_TV_INPUT_ID = "tv_input_id";

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

    method public void onSetTeletextAppEnabled(boolean);

    method public void onSignalStrength(int);

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

    method public void onStartInteractiveApp();

    method public void onStopInteractiveApp();

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

    method @CallSuper public void requestCurrentChannelUri();

    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 requestTrackInfoList();

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

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

    method public void sendCurrentTvInputId(@Nullable String);

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

    method public void sendStreamVolume(float);

    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);
@@ -26277,6 +26281,9 @@ package android.media.tv.interactive { 
    method public int setTvView(@Nullable android.media.tv.TvView);

    method public void startInteractiveApp();

    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 {









@@ -26290,6 +26297,7 @@ package android.media.tv.interactive {













    method public void onRequestCurrentChannelLcn(@NonNull String);















    method public void onRequestCurrentChannelUri(@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 onRequestTrackInfoList(@NonNull String);















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

























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



+2
−0






























Original line number
Diff line number
Diff line








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













    void onRequestStreamVolume(int seq);















    void onRequestTrackInfoList(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);















}
























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



+2
−0






























Original line number
Diff line number
Diff line








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













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















    void sendTrackInfoList(in IBinder sessionToken, in List<TvTrackInfo> tracks, 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,















            int seq, int userId);















    void releaseSession(in IBinder sessionToken, int userId);

































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



+1
−0






























Original line number
Diff line number
Diff line








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













    void sendStreamVolume(float volume);















    void sendTrackInfoList(in List<TvTrackInfo> tracks);















    void sendCurrentTvInputId(in String inputId);













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















    void release();















    void notifyTuned(in Uri channelUri);















    void notifyTrackSelected(int type, in String trackId);

































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



+1
−0






























Original line number
Diff line number
Diff line








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













    void onRequestStreamVolume();















    void onRequestTrackInfoList();















    void onRequestCurrentTvInputId();













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















    void onAdRequest(in AdRequest request);















}