am 71191442: TIF: Do not call session callbacks when the session is already released (4b1e5814) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/TvInputService.java

+27 −9

Original line number	Diff line number	Diff line
		@@ -310,7 +310,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifySessionEvent(" + eventType + ")");
		if (mSessionCallback != null) {
		mSessionCallback.onSessionEvent(eventType, eventArgs);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in sending event (event=" + eventType + ")");
		}
		@@ -329,7 +331,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyChannelRetuned");
		if (mSessionCallback != null) {
		mSessionCallback.onChannelRetuned(channelUri);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyChannelRetuned");
		}
		@@ -366,7 +370,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyTracksChanged");
		if (mSessionCallback != null) {
		mSessionCallback.onTracksChanged(tracks);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyTracksChanged");
		}
		@@ -394,7 +400,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyTrackSelected");
		if (mSessionCallback != null) {
		mSessionCallback.onTrackSelected(type, trackId);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyTrackSelected");
		}
		@@ -415,7 +423,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyVideoAvailable");
		if (mSessionCallback != null) {
		mSessionCallback.onVideoAvailable();
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyVideoAvailable");
		}
		@@ -447,7 +457,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyVideoUnavailable");
		if (mSessionCallback != null) {
		mSessionCallback.onVideoUnavailable(reason);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyVideoUnavailable");
		}
		@@ -486,7 +498,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyContentAllowed");
		if (mSessionCallback != null) {
		mSessionCallback.onContentAllowed();
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyContentAllowed");
		}
		@@ -526,7 +540,9 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "notifyContentBlocked");
		if (mSessionCallback != null) {
		mSessionCallback.onContentBlocked(rating.flattenToString());
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in notifyContentBlocked");
		}
		@@ -557,7 +573,9 @@ public abstract class TvInputService extends Service {
		try {
		if (DEBUG) Log.d(TAG, "layoutSurface (l=" + left + ", t=" + top + ", r="
		+ right + ", b=" + bottom + ",)");
		if (mSessionCallback != null) {
		mSessionCallback.onLayoutSurface(left, top, right, bottom);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "error in layoutSurface");
		}