Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev

Browse Source 
automerge: 085329b

* commit '085329b69abc0751591f99faf8a7e8fc2dc7c9df':
  TIF: Fix a typo and remove an unused method in TvInputService
This commit is contained in:
Dongwon Kang
2014-11-04 03:07:00 +00:00
committed by android-build-merger
parent 8e264a7703 085329b69a
commit e2e7e9df8b
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media/java/android/media/tv/TvInputService.java
View File

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