Merge "Unhide SSL Signing and Certificate APIs" into main (404ed228) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −0

media/java/android/media/tv/interactive/TvInteractiveAppManager.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2634,8 +2634,8 @@ public final class TvInteractiveAppManager {

	/**		/**
	* This is called when		* This is called when
	* {@link TvInteractiveAppService.Session#requestSigning(String, String, String, int, byte[])} is		* {@link TvInteractiveAppService.Session#requestSigning(String, String, String, int, byte[])}
	* called.		* is called.
	*		*
	* @param session A {@link TvInteractiveAppService.Session} associated with this callback.		* @param session A {@link TvInteractiveAppService.Session} associated with this callback.
	* @param signingId the ID to identify the request.		* @param signingId the ID to identify the request.
	@@ -2644,7 +2644,6 @@ public final class TvInteractiveAppManager {
	* @param host The host of the SSL CLient Authentication Server		* @param host The host of the SSL CLient Authentication Server
	* @param port The port of the SSL Client Authentication Server		* @param port The port of the SSL Client Authentication Server
	* @param data the original bytes to be signed.		* @param data the original bytes to be signed.
	* @hide
	*/		*/
	public void onRequestSigning(		public void onRequestSigning(
	Session session, String signingId, String algorithm, String host,		Session session, String signingId, String algorithm, String host,
	@@ -2657,7 +2656,6 @@ public final class TvInteractiveAppManager {
	* @param session A {@link TvInteractiveAppService.Session} associated with this callback.		* @param session A {@link TvInteractiveAppService.Session} associated with this callback.
	* @param host the host name of the SSL authentication server.		* @param host the host name of the SSL authentication server.
	* @param port the port of the SSL authentication server. E.g., 443		* @param port the port of the SSL authentication server. E.g., 443
	* @hide
	*/		*/
	public void onRequestCertificate(Session session, String host, int port) {		public void onRequestCertificate(Session session, String host, int port) {
	}		}

media/java/android/media/tv/interactive/TvInteractiveAppService.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -742,8 +742,8 @@ public abstract class TvInteractiveAppService extends Service {
	* @param host the host name of the SSL authentication server.		* @param host the host name of the SSL authentication server.
	* @param port the port of the SSL authentication server. E.g., 443		* @param port the port of the SSL authentication server. E.g., 443
	* @param cert the SSL certificate received.		* @param cert the SSL certificate received.
	* @hide
	*/		*/
			@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
	public void onCertificate(@NonNull String host, int port, @NonNull SslCertificate cert) {		public void onCertificate(@NonNull String host, int port, @NonNull SslCertificate cert) {
	}		}

	@@ -1666,9 +1666,9 @@ public abstract class TvInteractiveAppService extends Service {
	* @see #onSigningResult(String, byte[])		* @see #onSigningResult(String, byte[])
	* @see TvInteractiveAppView#createBiInteractiveApp(Uri, Bundle)		* @see TvInteractiveAppView#createBiInteractiveApp(Uri, Bundle)
	* @see TvInteractiveAppView#BI_INTERACTIVE_APP_KEY_ALIAS		* @see TvInteractiveAppView#BI_INTERACTIVE_APP_KEY_ALIAS
	* @hide
	*/		*/
	@CallSuper		@CallSuper
			@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
	public void requestSigning(@NonNull String signingId, @NonNull String algorithm,		public void requestSigning(@NonNull String signingId, @NonNull String algorithm,
	@NonNull String host, int port, @NonNull byte[] data) {		@NonNull String host, int port, @NonNull byte[] data) {
	executeOrPostRunnableOnMainThread(new Runnable() {		executeOrPostRunnableOnMainThread(new Runnable() {
	@@ -1695,8 +1695,9 @@ public abstract class TvInteractiveAppService extends Service {
	*		*
	* @param host the host name of the SSL authentication server.		* @param host the host name of the SSL authentication server.
	* @param port the port of the SSL authentication server. E.g., 443		* @param port the port of the SSL authentication server. E.g., 443
	* @hide
	*/		*/
			@CallSuper
			@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
	public void requestCertificate(@NonNull String host, int port) {		public void requestCertificate(@NonNull String host, int port) {
	executeOrPostRunnableOnMainThread(new Runnable() {		executeOrPostRunnableOnMainThread(new Runnable() {
	@MainThread		@MainThread

media/java/android/media/tv/interactive/TvInteractiveAppView.java

+62 −2

Original line number	Original line	Diff line number	Diff line
	@@ -760,12 +760,12 @@ public class TvInteractiveAppView extends ViewGroup {
	}		}

	/**		/**
	* Send the requested SSL certificate to the TV Interactive App		* Sends the requested SSL certificate to the TV Interactive App
	* @param host the host name of the SSL authentication server.		* @param host the host name of the SSL authentication server.
	* @param port the port of the SSL authentication server. E.g., 443		* @param port the port of the SSL authentication server. E.g., 443
	* @param cert the SSL certificate requested		* @param cert the SSL certificate requested
	* @hide
	*/		*/
			@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
	public void sendCertificate(@NonNull String host, int port, @NonNull SslCertificate cert) {		public void sendCertificate(@NonNull String host, int port, @NonNull SslCertificate cert) {
	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG, "sendCertificate");		Log.d(TAG, "sendCertificate");
	@@ -1389,6 +1389,37 @@ public class TvInteractiveAppView extends ViewGroup {
	@NonNull String algorithm, @NonNull String alias, @NonNull byte[] data) {		@NonNull String algorithm, @NonNull String alias, @NonNull byte[] data) {
	}		}

			/**
			* This is called when
			* {@link TvInteractiveAppService.Session#requestSigning(String, String, String, int, byte[])}
			* is called.
			*
			* @param iAppServiceId The ID of the TV interactive app service bound to this view.
			* @param signingId the ID to identify the request.
			* @param algorithm the standard name of the signature algorithm requested, such as
			* MD5withRSA, SHA256withDSA, etc.
			* @param host The hostname of the SSL authentication server.
			* @param port The port of the SSL authentication server.
			* @param data the original bytes to be signed.
			*/
			@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
			public void onRequestSigning(@NonNull String iAppServiceId, @NonNull String signingId,
			@NonNull String algorithm, @NonNull String host, int port, @NonNull byte[] data) {
			}

			/**
			* This is called when
			* {@link TvInteractiveAppService.Session#requestCertificate(String, int)} is called.
			*
			* @param iAppServiceId The ID of the TV interactive app service bound to this view.
			* @param host The hostname of the SSL authentication server.
			* @param port The port of the SSL authentication server.
			*/
			@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
			public void onRequestCertificate(@NonNull String iAppServiceId, @NonNull String host,
			int port) {
			}

	/**		/**
	* This is called when {@link TvInteractiveAppService.Session#setTvRecordingInfo(String,		* This is called when {@link TvInteractiveAppService.Session#setTvRecordingInfo(String,
	* TvRecordingInfo)} is called.		* TvRecordingInfo)} is called.
	@@ -1957,5 +1988,34 @@ public class TvInteractiveAppView extends ViewGroup {
	mCallback.onRequestSigning(mIAppServiceId, id, algorithm, alias, data);		mCallback.onRequestSigning(mIAppServiceId, id, algorithm, alias, data);
	}		}
	}		}

			@Override
			public void onRequestSigning(
			Session session, String id, String algorithm, String host, int port, byte[] data) {
			if (DEBUG) {
			Log.d(TAG, "onRequestSigning");
			}
			if (this != mSessionCallback) {
			Log.w(TAG, "onRequestSigning - session not created");
			return;
			}
			if (mCallback != null && Flags.tiafVApis()) {
			mCallback.onRequestSigning(mIAppServiceId, id, algorithm, host, port, data);
			}
			}

			@Override
			public void onRequestCertificate(Session session, String host, int port) {
			if (DEBUG) {
			Log.d(TAG, "onRequestCertificate");
			}
			if (this != mSessionCallback) {
			Log.w(TAG, "onRequestCertificate - session not created");
			return;
			}
			if (mCallback != null && Flags.tiafVApis()) {
			mCallback.onRequestCertificate(mIAppServiceId, host, port);
			}
			}
	}		}
	}		}