Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev (085329b6) · Commits · e / os / android_frameworks_base

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

+6 −14

Original line number	Diff line number	Diff line
		@@ -158,15 +158,6 @@ public abstract class TvInputService extends Service {
		};
		}

		/**
		* Get the number of callbacks that are registered.
		* @hide
		*/
		@VisibleForTesting
		public final int getRegisteredCallbackCount() {
		return mCallbacks.getRegisteredCallbackCount();
		}

		/**
		* Returns a concrete implementation of {@link Session}.
		* <p>
		@@ -550,13 +541,14 @@ public abstract class TvInputService extends Service {
		* @param left Left position in pixels, relative to the overlay view.
		* @param top Top position in pixels, relative to the overlay view.
		* @param right Right position in pixels, relative to the overlay view.
		* @param bottm Bottom position in pixels, relative to the overlay view.
		* @param bottom Bottom position in pixels, relative to the overlay view.
		* @see #onOverlayViewSizeChanged
		* @hide
		*/
		@SystemApi
		public void layoutSurface(final int left, final int top, final int right, final int bottm) {
		if (left > right \|\| top > bottm) {
		public void layoutSurface(final int left, final int top, final int right,
		final int bottom) {
		if (left > right \|\| top > bottom) {
		throw new IllegalArgumentException("Invalid parameter");
		}
		executeOrPostRunnable(new Runnable() {
		@@ -564,8 +556,8 @@ public abstract class TvInputService extends Service {
		public void run() {
		try {
		if (DEBUG) Log.d(TAG, "layoutSurface (l=" + left + ", t=" + top + ", r="
		+ right + ", b=" + bottm + ",)");
		mSessionCallback.onLayoutSurface(left, top, right, bottm);
		+ right + ", b=" + bottom + ",)");
		mSessionCallback.onLayoutSurface(left, top, right, bottom);
		} catch (RemoteException e) {
		Log.w(TAG, "error in layoutSurface");
		}