Merge "TIAF API review: rename onCreateBiInteractiveApp" into tm-dev (6c1f1099) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −2

media/java/android/media/tv/AdRequest.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,11 @@ public final class AdRequest implements Parcelable {

	/**		/**
	* Gets the metadata of the media file.		* Gets the metadata of the media file.
	* <p>This includes additional information the TV input needs to play the AD media.		*
			* <p>This includes additional information the TV input needs to play the AD media. This may
			* include fields in {@link android.media.MediaFormat} like
			* {@link android.media.MediaFormat#KEY_SAMPLE_RATE}, or integrity information like SHA. What
			* data is included depends on the format of the media file.
	*		*
	* @return The metadata of the media file. Can be an empty bundle for		* @return The metadata of the media file. Can be an empty bundle for
	* {@link #REQUEST_TYPE_STOP}.		* {@link #REQUEST_TYPE_STOP}.

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2021 The Android Open Source Project		* Copyright 2021 The Android Open Source Project
	*		*
	* Licensed under the Apache License, Version 2.0 (the "License");		* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.		* you may not use this file except in compliance with the License.

media/java/android/media/tv/interactive/AppLinkInfo.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2021 The Android Open Source Project		* Copyright 2021 The Android Open Source Project
	*		*
	* Licensed under the Apache License, Version 2.0 (the "License");		* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.		* you may not use this file except in compliance with the License.

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2021 The Android Open Source Project		* Copyright 2021 The Android Open Source Project
	*		*
	* Licensed under the Apache License, Version 2.0 (the "License");		* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.		* you may not use this file except in compliance with the License.

Original line number	Original line	Diff line number	Diff line
	@@ -26221,12 +26221,12 @@ package android.media.tv.interactive {
	method public void onBroadcastInfoResponse(@NonNull android.media.tv.BroadcastInfoResponse);		method public void onBroadcastInfoResponse(@NonNull android.media.tv.BroadcastInfoResponse);
	method public void onContentAllowed();		method public void onContentAllowed();
	method public void onContentBlocked(@NonNull android.media.tv.TvContentRating);		method public void onContentBlocked(@NonNull android.media.tv.TvContentRating);
	method public void onCreateBiInteractiveApp(@NonNull android.net.Uri, @Nullable android.os.Bundle);		method public void onCreateBiInteractiveAppRequest(@NonNull android.net.Uri, @Nullable android.os.Bundle);
	method @Nullable public android.view.View onCreateMediaView();		method @Nullable public android.view.View onCreateMediaView();
	method public void onCurrentChannelLcn(int);		method public void onCurrentChannelLcn(int);
	method public void onCurrentChannelUri(@Nullable android.net.Uri);		method public void onCurrentChannelUri(@Nullable android.net.Uri);
	method public void onCurrentTvInputId(@Nullable String);		method public void onCurrentTvInputId(@Nullable String);
	method public void onDestroyBiInteractiveApp(@NonNull String);		method public void onDestroyBiInteractiveAppRequest(@NonNull String);
	method public boolean onGenericMotionEvent(@NonNull android.view.MotionEvent);		method public boolean onGenericMotionEvent(@NonNull android.view.MotionEvent);
	method public boolean onKeyDown(int, @NonNull android.view.KeyEvent);		method public boolean onKeyDown(int, @NonNull android.view.KeyEvent);
	method public boolean onKeyLongPress(int, @NonNull android.view.KeyEvent);		method public boolean onKeyLongPress(int, @NonNull android.view.KeyEvent);
	@@ -26311,6 +26311,8 @@ package android.media.tv.interactive {
	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_ALIAS = "alias";
	field public static final String BI_INTERACTIVE_APP_KEY_CERTIFICATE = "certificate";		field public static final String BI_INTERACTIVE_APP_KEY_CERTIFICATE = "certificate";
			field public static final String BI_INTERACTIVE_APP_KEY_HTTP_ADDITIONAL_HEADERS = "http_additional_headers";
			field public static final String BI_INTERACTIVE_APP_KEY_HTTP_USER_AGENT = "http_user_agent";
	field public static final String BI_INTERACTIVE_APP_KEY_PRIVATE_KEY = "private_key";		field public static final String BI_INTERACTIVE_APP_KEY_PRIVATE_KEY = "private_key";
	}		}