Merge "Define const values used in BroadcastInfo classes" (b4e1b3d8) · Commits · e / os / android_frameworks_base

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

+24 −20

Original line number	Diff line number	Diff line
		@@ -16,38 +16,41 @@

		package android.media.tv;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;

		import android.annotation.NonNull;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/** @hide */
		public abstract class BroadcastInfoRequest implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({REQUEST_OPTION_REPEAT, REQUEST_OPTION_AUTO_UPDATE})
		public @interface RequestOption {}

		// todo: change const declaration to intdef
		public static final int REQUEST_OPTION_REPEAT = 11;
		public static final int REQUEST_OPTION_AUTO_UPDATE = 12;
		public static final int REQUEST_OPTION_REPEAT = 0;
		public static final int REQUEST_OPTION_AUTO_UPDATE = 1;

		public static final @NonNull Parcelable.Creator<BroadcastInfoRequest> CREATOR =
		new Parcelable.Creator<BroadcastInfoRequest>() {
		@Override
		public BroadcastInfoRequest createFromParcel(Parcel source) {
		int type = source.readInt();
		@TvInputManager.BroadcastInfoType int type = source.readInt();
		switch (type) {
		case BroadcastInfoType.TS:
		case TvInputManager.BROADCAST_INFO_TYPE_TS:
		return TsRequest.createFromParcelBody(source);
		case BroadcastInfoType.TABLE:
		return TableRequest.createFromParcelBody(source);
		case BroadcastInfoType.SECTION:
		case TvInputManager.BROADCAST_INFO_TYPE_SECTION:
		return SectionRequest.createFromParcelBody(source);
		case BroadcastInfoType.PES:
		case TvInputManager.BROADCAST_INFO_TYPE_PES:
		return PesRequest.createFromParcelBody(source);
		case BroadcastInfoType.STREAM_EVENT:
		case TvInputManager.BROADCAST_INFO_STREAM_EVENT:
		return StreamEventRequest.createFromParcelBody(source);
		case BroadcastInfoType.DSMCC:
		case TvInputManager.BROADCAST_INFO_TYPE_DSMCC:
		return DsmccRequest.createFromParcelBody(source);
		case BroadcastInfoType.TV_PROPRIETARY_FUNCTION:
		return TvProprietaryFunctionRequest.createFromParcelBody(source);
		case TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION:
		return CommandRequest.createFromParcelBody(source);
		default:
		throw new IllegalStateException(
		"Unexpected broadcast info request type (value "
		@@ -61,23 +64,24 @@ public abstract class BroadcastInfoRequest implements Parcelable {
		}
		};

		protected final int mType;
		protected final @TvInputManager.BroadcastInfoType int mType;
		protected final int mRequestId;
		protected final int mOption;
		protected final @RequestOption int mOption;

		protected BroadcastInfoRequest(int type, int requestId, int option) {
		protected BroadcastInfoRequest(@TvInputManager.BroadcastInfoType int type,
		int requestId, @RequestOption int option) {
		mType = type;
		mRequestId = requestId;
		mOption = option;
		}

		protected BroadcastInfoRequest(int type, Parcel source) {
		protected BroadcastInfoRequest(@TvInputManager.BroadcastInfoType int type, Parcel source) {
		mType = type;
		mRequestId = source.readInt();
		mOption = source.readInt();
		}

		public int getType() {
		public @TvInputManager.BroadcastInfoType int getType() {
		return mType;
		}

		@@ -85,7 +89,7 @@ public abstract class BroadcastInfoRequest implements Parcelable {
		return mRequestId;
		}

		public int getOption() {
		public @RequestOption int getOption() {
		return mOption;
		}

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

+26 −21

Original line number	Diff line number	Diff line
		@@ -16,38 +16,42 @@

		package android.media.tv;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;

		import android.annotation.NonNull;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/** @hide */
		public abstract class BroadcastInfoResponse implements Parcelable {
		// todo: change const declaration to intdef
		public static final int ERROR = 1;
		public static final int OK = 2;
		public static final int CANCEL = 3;
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({RESPONSE_RESULT_ERROR, RESPONSE_RESULT_OK, RESPONSE_RESULT_CANCEL})
		public @interface ResponseResult {}

		public static final int RESPONSE_RESULT_ERROR = 1;
		public static final int RESPONSE_RESULT_OK = 2;
		public static final int RESPONSE_RESULT_CANCEL = 3;

		public static final @NonNull Parcelable.Creator<BroadcastInfoResponse> CREATOR =
		new Parcelable.Creator<BroadcastInfoResponse>() {
		@Override
		public BroadcastInfoResponse createFromParcel(Parcel source) {
		int type = source.readInt();
		@TvInputManager.BroadcastInfoType int type = source.readInt();
		switch (type) {
		case BroadcastInfoType.TS:
		case TvInputManager.BROADCAST_INFO_TYPE_TS:
		return TsResponse.createFromParcelBody(source);
		case BroadcastInfoType.TABLE:
		return TableResponse.createFromParcelBody(source);
		case BroadcastInfoType.SECTION:
		case TvInputManager.BROADCAST_INFO_TYPE_SECTION:
		return SectionResponse.createFromParcelBody(source);
		case BroadcastInfoType.PES:
		case TvInputManager.BROADCAST_INFO_TYPE_PES:
		return PesResponse.createFromParcelBody(source);
		case BroadcastInfoType.STREAM_EVENT:
		case TvInputManager.BROADCAST_INFO_STREAM_EVENT:
		return StreamEventResponse.createFromParcelBody(source);
		case BroadcastInfoType.DSMCC:
		case TvInputManager.BROADCAST_INFO_TYPE_DSMCC:
		return DsmccResponse.createFromParcelBody(source);
		case BroadcastInfoType.TV_PROPRIETARY_FUNCTION:
		return TvProprietaryFunctionResponse.createFromParcelBody(source);
		case TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION:
		return CommandResponse.createFromParcelBody(source);
		default:
		throw new IllegalStateException(
		"Unexpected broadcast info response type (value "
		@@ -61,26 +65,27 @@ public abstract class BroadcastInfoResponse implements Parcelable {
		}
		};

		protected final int mType;
		protected final @TvInputManager.BroadcastInfoType int mType;
		protected final int mRequestId;
		protected final int mSequence;
		protected final int mResponseResult;
		protected final @ResponseResult int mResponseResult;

		protected BroadcastInfoResponse(int type, int requestId, int sequence, int responseResult) {
		protected BroadcastInfoResponse(@TvInputManager.BroadcastInfoType int type, int requestId,
		int sequence, @ResponseResult int responseResult) {
		mType = type;
		mRequestId = requestId;
		mSequence = sequence;
		mResponseResult = responseResult;
		}

		protected BroadcastInfoResponse(int type, Parcel source) {
		protected BroadcastInfoResponse(@TvInputManager.BroadcastInfoType int type, Parcel source) {
		mType = type;
		mRequestId = source.readInt();
		mSequence = source.readInt();
		mResponseResult = source.readInt();
		}

		public int getType() {
		public @TvInputManager.BroadcastInfoType int getType() {
		return mType;
		}

		@@ -92,7 +97,7 @@ public abstract class BroadcastInfoResponse implements Parcelable {
		return mSequence;
		}

		public int getResponseResult() {
		public @ResponseResult int getResponseResult() {
		return mResponseResult;
		}

media/java/android/media/tv/BroadcastInfoType.java

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.tv;

		/** @hide */
		public final class BroadcastInfoType {
		// todo: change const declaration to intdef in TvInputManager
		public static final int TS = 1;
		public static final int TABLE = 2;
		public static final int SECTION = 3;
		public static final int PES = 4;
		public static final int STREAM_EVENT = 5;
		public static final int DSMCC = 6;
		public static final int TV_PROPRIETARY_FUNCTION = 7;

		private BroadcastInfoType() {
		}
		}

media/java/android/media/tv/TvProprietaryFunctionRequest.java→media/java/android/media/tv/CommandRequest.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -21,20 +21,21 @@ import android.os.Parcel;
		import android.os.Parcelable;

		/** @hide */
		public class TvProprietaryFunctionRequest extends BroadcastInfoRequest implements Parcelable {
		public static final int requestType = BroadcastInfoType.TV_PROPRIETARY_FUNCTION;
		public final class CommandRequest extends BroadcastInfoRequest implements Parcelable {
		public static final @TvInputManager.BroadcastInfoType int requestType =
		TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION;

		public static final @NonNull Parcelable.Creator<TvProprietaryFunctionRequest> CREATOR =
		new Parcelable.Creator<TvProprietaryFunctionRequest>() {
		public static final @NonNull Parcelable.Creator<CommandRequest> CREATOR =
		new Parcelable.Creator<CommandRequest>() {
		@Override
		public TvProprietaryFunctionRequest createFromParcel(Parcel source) {
		public CommandRequest createFromParcel(Parcel source) {
		source.readInt();
		return createFromParcelBody(source);
		}

		@Override
		public TvProprietaryFunctionRequest[] newArray(int size) {
		return new TvProprietaryFunctionRequest[size];
		public CommandRequest[] newArray(int size) {
		return new CommandRequest[size];
		}
		};

		@@ -42,11 +43,11 @@ public class TvProprietaryFunctionRequest extends BroadcastInfoRequest implement
		private final String mName;
		private final String mArguments;

		public static TvProprietaryFunctionRequest createFromParcelBody(Parcel in) {
		return new TvProprietaryFunctionRequest(in);
		public static CommandRequest createFromParcelBody(Parcel in) {
		return new CommandRequest(in);
		}

		public TvProprietaryFunctionRequest(int requestId, int option, String nameSpace,
		public CommandRequest(int requestId, @RequestOption int option, String nameSpace,
		String name, String arguments) {
		super(requestType, requestId, option);
		mNameSpace = nameSpace;
		@@ -54,7 +55,7 @@ public class TvProprietaryFunctionRequest extends BroadcastInfoRequest implement
		mArguments = arguments;
		}

		protected TvProprietaryFunctionRequest(Parcel source) {
		protected CommandRequest(Parcel source) {
		super(requestType, source);
		mNameSpace = source.readString();
		mName = source.readString();

media/java/android/media/tv/TvProprietaryFunctionResponse.java→media/java/android/media/tv/CommandResponse.java

+13 −12

Original line number	Diff line number	Diff line
		@@ -21,36 +21,37 @@ import android.os.Parcel;
		import android.os.Parcelable;

		/** @hide */
		public class TvProprietaryFunctionResponse extends BroadcastInfoResponse implements Parcelable {
		public static final int responseType = BroadcastInfoType.TV_PROPRIETARY_FUNCTION;
		public final class CommandResponse extends BroadcastInfoResponse implements Parcelable {
		public static final @TvInputManager.BroadcastInfoType int responseType =
		TvInputManager.BROADCAST_INFO_TYPE_TV_PROPRIETARY_FUNCTION;

		public static final @NonNull Parcelable.Creator<TvProprietaryFunctionResponse> CREATOR =
		new Parcelable.Creator<TvProprietaryFunctionResponse>() {
		public static final @NonNull Parcelable.Creator<CommandResponse> CREATOR =
		new Parcelable.Creator<CommandResponse>() {
		@Override
		public TvProprietaryFunctionResponse createFromParcel(Parcel source) {
		public CommandResponse createFromParcel(Parcel source) {
		source.readInt();
		return createFromParcelBody(source);
		}

		@Override
		public TvProprietaryFunctionResponse[] newArray(int size) {
		return new TvProprietaryFunctionResponse[size];
		public CommandResponse[] newArray(int size) {
		return new CommandResponse[size];
		}
		};

		private final String mResponse;

		public static TvProprietaryFunctionResponse createFromParcelBody(Parcel in) {
		return new TvProprietaryFunctionResponse(in);
		public static CommandResponse createFromParcelBody(Parcel in) {
		return new CommandResponse(in);
		}

		public TvProprietaryFunctionResponse(int requestId, int sequence, int responseResult,
		String response) {
		public CommandResponse(int requestId, int sequence,
		@ResponseResult int responseResult, String response) {
		super(responseType, requestId, sequence, responseResult);
		mResponse = response;
		}

		protected TvProprietaryFunctionResponse(Parcel source) {
		protected CommandResponse(Parcel source) {
		super(responseType, source);
		mResponse = source.readString();
		}