Merge "TIAF: add state change methods" (9d8a6151) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,4 +30,5 @@ oneway interface ITvIAppClient {
		void onSessionReleased(int seq);
		void onLayoutSurface(int left, int top, int right, int bottom, int seq);
		void onBroadcastInfoRequest(in BroadcastInfoRequest request, int seq);
		void onSessionStateChanged(int state, int seq);
		}
		No newline at end of file

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,4 +27,5 @@ interface ITvIAppManagerCallback {
		void onIAppServiceRemoved(in String iAppServiceId);
		void onIAppServiceUpdated(in String iAppServiceId);
		void onTvIAppInfoUpdated(in TvIAppInfo tvIAppInfo);
		void onStateChanged(in String iAppServiceId, int type, int state);
		}
		No newline at end of file

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,4 +22,5 @@ package android.media.tv.interactive;
		* @hide
		*/
		oneway interface ITvIAppServiceCallback {
		void onStateChanged(int type, int state);
		}
		No newline at end of file

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,4 +29,5 @@ oneway interface ITvIAppSessionCallback {
		void onSessionCreated(in ITvIAppSession session);
		void onLayoutSurface(int left, int top, int right, int bottom);
		void onBroadcastInfoRequest(in BroadcastInfoRequest request);
		void onSessionStateChanged(int state);
		}
		No newline at end of file

media/java/android/media/tv/interactive/TvIAppManager.java

+90 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.media.tv.interactive;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemService;
		@@ -41,6 +42,8 @@ import android.view.View;

		import com.android.internal.util.Preconditions;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Iterator;
		import java.util.LinkedList;
		import java.util.List;
		@@ -54,6 +57,36 @@ public final class TvIAppManager {
		// TODO: cleanup and unhide public APIs
		private static final String TAG = "TvIAppManager";

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(flag = false, prefix = "TV_IAPP_RTE_STATE_", value = {
		TV_IAPP_RTE_STATE_UNREALIZED,
		TV_IAPP_RTE_STATE_PREPARING,
		TV_IAPP_RTE_STATE_READY,
		TV_IAPP_RTE_STATE_ERROR})
		public @interface TvIAppRteState {}

		/**
		* Unrealized state of interactive app RTE.
		* @hide
		*/
		public static final int TV_IAPP_RTE_STATE_UNREALIZED = 1;
		/**
		* Preparing state of interactive app RTE.
		* @hide
		*/
		public static final int TV_IAPP_RTE_STATE_PREPARING = 2;
		/**
		* Ready state of interactive app RTE.
		* @hide
		*/
		public static final int TV_IAPP_RTE_STATE_READY = 3;
		/**
		* Error state of interactive app RTE.
		* @hide
		*/
		public static final int TV_IAPP_RTE_STATE_ERROR = 4;

		private final ITvIAppManager mService;
		private final int mUserId;

		@@ -134,9 +167,20 @@ public final class TvIAppManager {
		record.postBroadcastInfoRequest(request);
		}
		}

		@Override
		public void onSessionStateChanged(int state, int seq) {
		synchronized (mSessionCallbackRecordMap) {
		SessionCallbackRecord record = mSessionCallbackRecordMap.get(seq);
		if (record == null) {
		Log.e(TAG, "Callback not found for seq " + seq);
		return;
		}
		record.postSessionStateChanged(state);
		}
		}
		};
		ITvIAppManagerCallback managerCallback = new ITvIAppManagerCallback.Stub() {
		// TODO: handle IApp service state changes
		@Override
		public void onIAppServiceAdded(String iAppServiceId) {
		synchronized (mLock) {
		@@ -173,6 +217,15 @@ public final class TvIAppManager {
		}
		}
		}

		@Override
		public void onStateChanged(String iAppServiceId, int type, int state) {
		synchronized (mLock) {
		for (TvIAppCallbackRecord record : mCallbackRecords) {
		record.postStateChanged(iAppServiceId, type, state);
		}
		}
		}
		};
		try {
		if (mService != null) {
		@@ -233,6 +286,15 @@ public final class TvIAppManager {
		*/
		public void onTvIAppInfoUpdated(TvIAppInfo iAppInfo) {
		}


		/**
		* This is called when the state of the interactive app service is changed.
		* @hide
		*/
		public void onTvIAppServiceStateChanged(
		String iAppServiceId, int type, @TvIAppRteState int state) {
		}
		}

		private static final class TvIAppCallbackRecord {
		@@ -283,6 +345,15 @@ public final class TvIAppManager {
		}
		});
		}

		public void postStateChanged(String iAppServiceId, int type, int state) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		mCallback.onTvIAppServiceStateChanged(iAppServiceId, type, state);
		}
		});
		}
		}

		/**
		@@ -875,6 +946,15 @@ public final class TvIAppManager {
		}
		});
		}

		void postSessionStateChanged(int state) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		mSessionCallback.onSessionStateChanged(mSession, state);
		}
		});
		}
		}

		/**
		@@ -912,5 +992,14 @@ public final class TvIAppManager {
		*/
		public void onLayoutSurface(Session session, int left, int top, int right, int bottom) {
		}

		/**
		* This is called when {@link TvIAppService.Session#notifySessionStateChanged} is called.
		*
		* @param session A {@link TvIAppManager.Session} associated with this callback.
		* @param state the current state.
		*/
		public void onSessionStateChanged(Session session, int state) {
		}
		}
		}