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

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

Merge "TIAF cleanup: add missing APIs part 2"

parents 87945271 bf93602e

media/java/android/media/tv/BroadcastInfoRequest.java

+3 −1
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ public abstract class BroadcastInfoRequest implements Parcelable { 
                            return StreamEventRequest.createFromParcelBody(source);

                        case TvInputManager.BROADCAST_INFO_TYPE_DSMCC:

                            return DsmccRequest.createFromParcelBody(source);

                        case TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION:

                        case TvInputManager.BROADCAST_INFO_TYPE_COMMAND:

                            return CommandRequest.createFromParcelBody(source);

                        case TvInputManager.BROADCAST_INFO_TYPE_TIMELINE:

                            return TimelineRequest.createFromParcelBody(source);

                        default:

                            throw new IllegalStateException(

                                    "Unexpected broadcast info request type (value "

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

+3 −1
Original line number Diff line number Diff line
@@ -50,8 +50,10 @@ public abstract class BroadcastInfoResponse implements Parcelable { 
                            return StreamEventResponse.createFromParcelBody(source);

                        case TvInputManager.BROADCAST_INFO_TYPE_DSMCC:

                            return DsmccResponse.createFromParcelBody(source);

                        case TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION:

                        case TvInputManager.BROADCAST_INFO_TYPE_COMMAND:

                            return CommandResponse.createFromParcelBody(source);

                        case TvInputManager.BROADCAST_INFO_TYPE_TIMELINE:

                            return TimelineResponse.createFromParcelBody(source);

                        default:

                            throw new IllegalStateException(

                                    "Unexpected broadcast info response type (value "

media/java/android/media/tv/CommandRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.os.Parcelable; 
/** @hide */

public final class CommandRequest extends BroadcastInfoRequest implements Parcelable {

    public static final @TvInputManager.BroadcastInfoType int requestType =

            TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION;

            TvInputManager.BROADCAST_INFO_TYPE_COMMAND;



    public static final @NonNull Parcelable.Creator<CommandRequest> CREATOR =

            new Parcelable.Creator<CommandRequest>() {

media/java/android/media/tv/CommandResponse.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.os.Parcelable; 
/** @hide */

public final class CommandResponse extends BroadcastInfoResponse implements Parcelable {

    public static final @TvInputManager.BroadcastInfoType int responseType =

            TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION;

            TvInputManager.BROADCAST_INFO_TYPE_COMMAND;



    public static final @NonNull Parcelable.Creator<CommandResponse> CREATOR =

            new Parcelable.Creator<CommandResponse>() {

media/java/android/media/tv/DsmccResponse.java

+13 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ import android.os.Parcel; 
import android.os.ParcelFileDescriptor;

import android.os.Parcelable;



import java.util.ArrayList;

import java.util.List;



/** @hide */

public final class DsmccResponse extends BroadcastInfoResponse implements Parcelable {

    public static final @TvInputManager.BroadcastInfoType int responseType =
@@ -41,20 +44,27 @@ public final class DsmccResponse extends BroadcastInfoResponse implements Parcel 
            };



    private final ParcelFileDescriptor mFileDescriptor;

    private final boolean mIsDirectory;

    private final List<String> mChildren;



    public static DsmccResponse createFromParcelBody(Parcel in) {

        return new DsmccResponse(in);

    }



    public DsmccResponse(int requestId, int sequence, @ResponseResult int responseResult,

            ParcelFileDescriptor file) {

            ParcelFileDescriptor file, boolean isDirectory, List<String> children) {

        super(responseType, requestId, sequence, responseResult);

        mFileDescriptor = file;

        mIsDirectory = isDirectory;

        mChildren = children;

    }



    protected DsmccResponse(Parcel source) {

        super(responseType, source);

        mFileDescriptor = source.readFileDescriptor();

        mIsDirectory = (source.readInt() == 1);

        mChildren = new ArrayList<>();

        source.readStringList(mChildren);

    }



    public ParcelFileDescriptor getFile() {
@@ -65,5 +75,7 @@ public final class DsmccResponse extends BroadcastInfoResponse implements Parcel 
    public void writeToParcel(@NonNull Parcel dest, int flags) {

        super.writeToParcel(dest, flags);

        mFileDescriptor.writeToParcel(dest, flags);

        dest.writeInt(mIsDirectory ? 1 : 0);

        dest.writeStringList(mChildren);

    }

}