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

Commit 0451ef6f authored by Yixiao Luo's avatar Yixiao Luo Committed by Android (Google) Code Review
Browse files

Merge "TIAF-TIF broadcastinfo flow"

parents 05d7ea73 b488c1ba

media/java/android/media/tv/BroadcastInfoResponse.java

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ public final class BroadcastInfoResponse implements Parcelable { 
        requestId = source.readInt();

    }



    public int getRequestId() {

        return requestId;

    }



    @Override

    public int describeContents() {

        return 0;

media/java/android/media/tv/TvInputManager.java

+1 −8
Original line number Diff line number Diff line
@@ -657,13 +657,6 @@ public final class TvInputManager { 
         */

        void onError(Session session, @TvInputManager.RecordingError int error) {

        }



        /**

         * @param session

         * @param response

         */

        public void onBroadcastInfoResponse(Session session, BroadcastInfoResponse response) {

        }

    }



    private static final class SessionCallbackRecord {
@@ -848,7 +841,7 @@ public final class TvInputManager { 
            mHandler.post(new Runnable() {

                @Override

                public void run() {

                    mSessionCallback.onBroadcastInfoResponse(mSession, response);

                    mSession.getIAppSession().notifyBroadcastInfoResponse(response);

                }

            });

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



package android.media.tv.interactive;

import android.media.tv.BroadcastInfoRequest;



import android.view.InputChannel;
@@ -27,4 +28,5 @@ oneway interface ITvIAppClient { 
    void onSessionCreated(in String iAppServiceId, IBinder token, in InputChannel channel, int seq);

    void onSessionReleased(int seq);

    void onLayoutSurface(int left, int top, int right, int bottom, int seq);

    void onBroadcastInfoRequest(in BroadcastInfoRequest request, int seq);

}
 
 No newline at end of file

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

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.media.tv.interactive; 
import android.media.tv.interactive.ITvIAppClient;

import android.media.tv.interactive.ITvIAppManagerCallback;

import android.media.tv.interactive.TvIAppInfo;

import android.media.tv.BroadcastInfoResponse;

import android.view.Surface;



/**
@@ -34,6 +35,8 @@ interface ITvIAppManager { 
    void setSurface(in IBinder sessionToken, in Surface surface, int userId);

    void dispatchSurfaceChanged(in IBinder sessionToken, int format, int width, int height,

            int userId);

    void notifyBroadcastInfoResponse(in IBinder sessionToken, in BroadcastInfoResponse response,

            int UserId);



    void registerCallback(in ITvIAppManagerCallback callback, int userId);

    void unregisterCallback(in ITvIAppManagerCallback callback, int userId);

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media.tv.interactive;



import android.view.Surface;

import android.media.tv.BroadcastInfoResponse;



/**

 * Sub-interface of ITvIAppService.aidl which is created per session and has its own context.
@@ -27,4 +28,5 @@ oneway interface ITvIAppSession { 
    void release();

    void setSurface(in Surface surface);

    void dispatchSurfaceChanged(int format, int width, int height);

    void notifyBroadcastInfoResponse(in BroadcastInfoResponse response);

}
 
 No newline at end of file