Merge "Add requestCertificate" into main (2c2a73ef) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,8 @@ oneway interface ITvInteractiveAppClient {
	void onSetTvRecordingInfo(in String recordingId, in TvRecordingInfo recordingInfo, int seq);		void onSetTvRecordingInfo(in String recordingId, in TvRecordingInfo recordingInfo, int seq);
	void onRequestTvRecordingInfo(in String recordingId, int seq);		void onRequestTvRecordingInfo(in String recordingId, int seq);
	void onRequestTvRecordingInfoList(in int type, int seq);		void onRequestTvRecordingInfoList(in int type, int seq);
	void onRequestSigning(		void onRequestSigning(in String id, in String algorithm, in String alias, in byte[] data,
	in String id, in String algorithm, in String alias, in byte[] data, int seq);		int seq);
			void onRequestCertificate(in String host, int port, int seq);
	void onAdRequest(in AdRequest request, int Seq);		void onAdRequest(in AdRequest request, int Seq);
	}		}

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,8 @@ interface ITvInteractiveAppManager {
	void sendAvailableSpeeds(in IBinder sessionToken, in float[] speeds, int userId);		void sendAvailableSpeeds(in IBinder sessionToken, in float[] speeds, int userId);
	void sendSigningResult(in IBinder sessionToken, in String signingId, in byte[] result,		void sendSigningResult(in IBinder sessionToken, in String signingId, in byte[] result,
	int userId);		int userId);
			void sendCertificate(in IBinder sessionToken, in String host, int port,
			in Bundle certBundle, int userId);
	void sendTvRecordingInfo(in IBinder sessionToken, in TvRecordingInfo recordingInfo, int userId);		void sendTvRecordingInfo(in IBinder sessionToken, in TvRecordingInfo recordingInfo, int userId);
	void sendTvRecordingInfoList(in IBinder sessionToken,		void sendTvRecordingInfoList(in IBinder sessionToken,
	in List<TvRecordingInfo> recordingInfoList, int userId);		in List<TvRecordingInfo> recordingInfoList, int userId);

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ oneway interface ITvInteractiveAppSession {
	void sendTimeShiftMode(int mode);		void sendTimeShiftMode(int mode);
	void sendAvailableSpeeds(in float[] speeds);		void sendAvailableSpeeds(in float[] speeds);
	void sendSigningResult(in String signingId, in byte[] result);		void sendSigningResult(in String signingId, in byte[] result);
			void sendCertificate(in String host, int port, in Bundle certBundle);
	void sendTvRecordingInfo(in TvRecordingInfo recordingInfo);		void sendTvRecordingInfo(in TvRecordingInfo recordingInfo);
	void sendTvRecordingInfoList(in List<TvRecordingInfo> recordingInfoList);		void sendTvRecordingInfoList(in List<TvRecordingInfo> recordingInfoList);
	void notifyError(in String errMsg, in Bundle params);		void notifyError(in String errMsg, in Bundle params);

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,5 +61,6 @@ oneway interface ITvInteractiveAppSessionCallback {
	void onRequestTvRecordingInfo(in String recordingId);		void onRequestTvRecordingInfo(in String recordingId);
	void onRequestTvRecordingInfoList(in int type);		void onRequestTvRecordingInfoList(in int type);
	void onRequestSigning(in String id, in String algorithm, in String alias, in byte[] data);		void onRequestSigning(in String id, in String algorithm, in String alias, in byte[] data);
			void onRequestCertificate(in String host, int port);
	void onAdRequest(in AdRequest request);		void onAdRequest(in AdRequest request);
	}		}

media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,7 @@ public class ITvInteractiveAppSessionWrapper
	private static final int DO_SEND_AVAILABLE_SPEEDS = 47;		private static final int DO_SEND_AVAILABLE_SPEEDS = 47;
	private static final int DO_SEND_SELECTED_TRACK_INFO = 48;		private static final int DO_SEND_SELECTED_TRACK_INFO = 48;
	private static final int DO_NOTIFY_VIDEO_FREEZE_UPDATED = 49;		private static final int DO_NOTIFY_VIDEO_FREEZE_UPDATED = 49;
			private static final int DO_SEND_CERTIFICATE = 50;

	private final HandlerCaller mCaller;		private final HandlerCaller mCaller;
	private Session mSessionImpl;		private Session mSessionImpl;
	@@ -369,6 +370,13 @@ public class ITvInteractiveAppSessionWrapper
	mSessionImpl.notifyVideoFreezeUpdated((Boolean) msg.obj);		mSessionImpl.notifyVideoFreezeUpdated((Boolean) msg.obj);
	break;		break;
	}		}
			case DO_SEND_CERTIFICATE: {
			SomeArgs args = (SomeArgs) msg.obj;
			mSessionImpl.sendCertificate((String) args.arg1, (Integer) args.arg2,
			(Bundle) args.arg3);
			args.recycle();
			break;
			}
	default: {		default: {
	Log.w(TAG, "Unhandled message code: " + msg.what);		Log.w(TAG, "Unhandled message code: " + msg.what);
	break;		break;
	@@ -482,6 +490,12 @@ public class ITvInteractiveAppSessionWrapper
	mCaller.obtainMessageOO(DO_SEND_SIGNING_RESULT, signingId, result));		mCaller.obtainMessageOO(DO_SEND_SIGNING_RESULT, signingId, result));
	}		}

			@Override
			public void sendCertificate(@NonNull String host, int port, @NonNull Bundle certBundle) {
			mCaller.executeOrSendMessage(
			mCaller.obtainMessageOOO(DO_SEND_CERTIFICATE, host, port, certBundle));
			}

	@Override		@Override
	public void notifyError(@NonNull String errMsg, @NonNull Bundle params) {		public void notifyError(@NonNull String errMsg, @NonNull Bundle params) {
	mCaller.executeOrSendMessage(		mCaller.executeOrSendMessage(