Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev (2750d21d) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −11

Original line number	Diff line number	Diff line
		@@ -15923,12 +15923,10 @@ package android.media.tv {

		public final class TvInputInfo implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getComponent();
		method public java.lang.String getId();
		method public android.content.Intent getIntentForSettingsActivity();
		method public android.content.Intent getIntentForSetupActivity();
		method public java.lang.String getPackageName();
		method public java.lang.String getServiceName();
		method public android.content.pm.ServiceInfo getServiceInfo();
		method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String EXTRA_SERVICE_NAME = "serviceName";
		@@ -15938,13 +15936,11 @@ package android.media.tv {
		method public void createSession(java.lang.String, android.media.tv.TvInputManager.SessionCallback, android.os.Handler);
		method public boolean getAvailability(java.lang.String);
		method public java.util.List<android.media.tv.TvInputInfo> getTvInputList();
		method public void registerListener(java.lang.String, android.media.tv.TvInputManager.TvInputListener, android.os.Handler);
		method public void unregisterListener(java.lang.String, android.media.tv.TvInputManager.TvInputListener);
		}

		public static final class TvInputManager.Session {
		method public void release();
		method public void setVolume(float);
		method public void setStreamVolume(float);
		method public void tune(android.net.Uri);
		}

		@@ -15962,14 +15958,13 @@ package android.media.tv {
		public abstract class TvInputService extends android.app.Service {
		ctor public TvInputService();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.media.tv.TvInputService.TvInputSessionImpl onCreateSession();
		method public final void setAvailable(boolean);
		method public abstract android.media.tv.TvInputService.Session onCreateSession();
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
		}

		public abstract class TvInputService.TvInputSessionImpl implements android.view.KeyEvent.Callback {
		ctor public TvInputService.TvInputSessionImpl();
		public abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
		ctor public TvInputService.Session();
		method public android.view.View onCreateOverlayView();
		method public boolean onGenericMotionEvent(android.view.MotionEvent);
		method public boolean onKeyDown(int, android.view.KeyEvent);
		@@ -15977,8 +15972,8 @@ package android.media.tv {
		method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
		method public boolean onKeyUp(int, android.view.KeyEvent);
		method public abstract void onRelease();
		method public abstract void onSetStreamVolume(float);
		method public abstract boolean onSetSurface(android.view.Surface);
		method public abstract void onSetVolume(float);
		method public boolean onTouchEvent(android.view.MotionEvent);
		method public boolean onTrackballEvent(android.view.MotionEvent);
		method public abstract boolean onTune(android.net.Uri);
		@@ -15993,6 +15988,7 @@ package android.media.tv {
		method public boolean dispatchUnhandledInputEvent(android.view.InputEvent);
		method public boolean onUnhandledInputEvent(android.view.InputEvent);
		method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);
		method public void setStreamVolume(float);
		method public void unbindTvInput();
		}

media/java/android/media/tv/ITvInputSessionWrapper.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package android.media.tv;

		import android.content.Context;
		import android.graphics.Rect;
		import android.media.tv.TvInputManager.Session;
		import android.media.tv.TvInputService.TvInputSessionImpl;
		import android.net.Uri;
		import android.os.IBinder;
		import android.os.Looper;
		@@ -52,11 +50,11 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand

		private final HandlerCaller mCaller;

		private TvInputSessionImpl mTvInputSessionImpl;
		private TvInputService.Session mTvInputSessionImpl;
		private InputChannel mChannel;
		private TvInputEventReceiver mReceiver;

		public ITvInputSessionWrapper(Context context, TvInputSessionImpl sessionImpl,
		public ITvInputSessionWrapper(Context context, TvInputService.Session sessionImpl,
		InputChannel channel) {
		mCaller = new HandlerCaller(context, null, this, true /* asyncHandler */);
		mTvInputSessionImpl = sessionImpl;
		@@ -169,8 +167,8 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
		}

		int handled = mTvInputSessionImpl.dispatchInputEvent(event, this);
		if (handled != Session.DISPATCH_IN_PROGRESS) {
		finishInputEvent(event, handled == Session.DISPATCH_HANDLED);
		if (handled != TvInputManager.Session.DISPATCH_IN_PROGRESS) {
		finishInputEvent(event, handled == TvInputManager.Session.DISPATCH_HANDLED);
		}
		}
		}

media/java/android/media/tv/TvInputInfo.java

+8 −14

Original line number	Diff line number	Diff line
		@@ -138,21 +138,15 @@ public final class TvInputInfo implements Parcelable {
		}

		/**
		* Returns the .apk package that implements this TV input service.
		* Returns the information of the service that implements this TV input.
		*/
		public String getPackageName() {
		return mService.serviceInfo.packageName;
		}

		/**
		* Returns the class name of the service component that implements this TV input service.
		*/
		public String getServiceName() {
		return mService.serviceInfo.name;
		public ServiceInfo getServiceInfo() {
		return mService.serviceInfo;
		}

		/**
		* Returns the component of the service that implements this TV input.
		* @hide
		*/
		public ComponentName getComponent() {
		return new ComponentName(mService.serviceInfo.packageName, mService.serviceInfo.name);
		@@ -164,8 +158,8 @@ public final class TvInputInfo implements Parcelable {
		public Intent getIntentForSetupActivity() {
		if (!TextUtils.isEmpty(mSetupActivity)) {
		Intent intent = new Intent(Intent.ACTION_MAIN);
		intent.setClassName(getPackageName(), mSetupActivity);
		intent.putExtra(EXTRA_SERVICE_NAME, getServiceName());
		intent.setClassName(mService.serviceInfo.packageName, mSetupActivity);
		intent.putExtra(EXTRA_SERVICE_NAME, mService.serviceInfo.name);
		return intent;
		}
		return null;
		@@ -177,8 +171,8 @@ public final class TvInputInfo implements Parcelable {
		public Intent getIntentForSettingsActivity() {
		if (!TextUtils.isEmpty(mSettingsActivity)) {
		Intent intent = new Intent(Intent.ACTION_MAIN);
		intent.setClassName(getPackageName(), mSettingsActivity);
		intent.putExtra(EXTRA_SERVICE_NAME, getServiceName());
		intent.setClassName(mService.serviceInfo.packageName, mSettingsActivity);
		intent.putExtra(EXTRA_SERVICE_NAME, mService.serviceInfo.name);
		return intent;
		}
		return null;

media/java/android/media/tv/TvInputManager.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -390,6 +390,7 @@ public final class TvInputManager {
		* @param listener a listener used to monitor status of the given TV input.
		* @param handler a {@link Handler} that the status change will be delivered to.
		* @throws IllegalArgumentException if any of the arguments is {@code null}.
		* @hide
		*/
		public void registerListener(String inputId, TvInputListener listener, Handler handler) {
		if (inputId == null) {
		@@ -422,6 +423,7 @@ public final class TvInputManager {
		* @param inputId the id of the TV input.
		* @param listener the existing listener to remove for the given TV input.
		* @throws IllegalArgumentException if any of the arguments is {@code null}.
		* @hide
		*/
		public void unregisterListener(String inputId, final TvInputListener listener) {
		if (inputId == null) {
		@@ -562,13 +564,13 @@ public final class TvInputManager {
		}

		/**
		* Sets the relative volume of this session to handle a change of audio focus.
		* Sets the relative stream volume of this session to handle a change of audio focus.
		*
		* @param volume A volume value between 0.0f to 1.0f.
		* @throws IllegalArgumentException if the volume value is out of range.
		* @throws IllegalStateException if the session has been already released.
		*/
		public void setVolume(float volume) {
		public void setStreamVolume(float volume) {
		if (mToken == null) {
		throw new IllegalStateException("the session has been already released");
		}

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

+30 −33

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.graphics.PixelFormat;
		import android.graphics.Rect;
		import android.media.tv.ITvInputService;
		import android.media.tv.TvInputManager.Session;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -47,7 +45,17 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.os.SomeArgs;

		/**
		* A base class for implementing television input service.
		* The TvInputService class represents a TV input or source such as HDMI or built-in tuner which
		* provides pass-through video or broadcast TV programs.
		* <p>
		* Applications will not normally use this service themselves, instead relying on the standard
		* interaction provided by {@link TvView}. Those implementing TV input services should normally do
		* so by deriving from this class and providing their own session implementation based on
		* {@link TvInputService.Session}. All TV input services must require that clients hold the
		* {@link android.Manifest.permission#BIND_TV_INPUT} in order to interact with the service; if this
		* permission is not specified in the manifest, the system will refuse to bind to that TV input
		* service.
		* </p>
		*/
		public abstract class TvInputService extends Service {
		// STOPSHIP: Turn debugging off.
		@@ -74,7 +82,9 @@ public abstract class TvInputService extends Service {
		private final Handler mHandler = new ServiceHandler();
		private final RemoteCallbackList<ITvInputServiceCallback> mCallbacks =
		new RemoteCallbackList<ITvInputServiceCallback>();
		private boolean mAvailable;
		// STOPSHIP: Redesign the API around the availability change. For now, the service will be
		// always available.
		private final boolean mAvailable = true;

		@Override
		public void onCreate() {
		@@ -123,19 +133,6 @@ public abstract class TvInputService extends Service {
		};
		}

		/**
		* Convenience method to notify an availability change of this TV input service.
		*
		* @param available {@code true} if the input service is available to show TV programs.
		*/
		public final void setAvailable(boolean available) {
		if (available != mAvailable) {
		mAvailable = available;
		mHandler.obtainMessage(ServiceHandler.DO_BROADCAST_AVAILABILITY_CHANGE, available)
		.sendToTarget();
		}
		}

		/**
		* Get the number of callbacks that are registered.
		*
		@@ -147,17 +144,17 @@ public abstract class TvInputService extends Service {
		}

		/**
		* Returns a concrete implementation of {@link TvInputSessionImpl}.
		* Returns a concrete implementation of {@link Session}.
		* <p>
		* May return {@code null} if this TV input service fails to create a session for some reason.
		* </p>
		*/
		public abstract TvInputSessionImpl onCreateSession();
		public abstract Session onCreateSession();

		/**
		* Base class for derived classes to implement to provide {@link TvInputManager.Session}.
		*/
		public abstract class TvInputSessionImpl implements KeyEvent.Callback {
		public abstract class Session implements KeyEvent.Callback {
		private final KeyEvent.DispatcherState mDispatcherState = new KeyEvent.DispatcherState();
		private final WindowManager mWindowManager;
		private WindowManager.LayoutParams mWindowParams;
		@@ -168,7 +165,7 @@ public abstract class TvInputService extends Service {
		private Rect mOverlayFrame;
		private ITvInputSessionCallback mSessionCallback;

		public TvInputSessionImpl() {
		public Session() {
		mWindowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
		}

		@@ -303,12 +300,12 @@ public abstract class TvInputService extends Service {
		public abstract boolean onSetSurface(Surface surface);

		/**
		* Sets the relative volume of the current TV input session to handle the change of audio
		* focus by setting.
		* Sets the relative stream volume of the current TV input session to handle the change of
		* audio focus by setting.
		*
		* @param volume Volume scale from 0.0 to 1.0.
		*/
		public abstract void onSetVolume(float volume);
		public abstract void onSetStreamVolume(float volume);

		/**
		* Tunes to a given channel.
		@@ -469,10 +466,10 @@ public abstract class TvInputService extends Service {
		}

		/**
		* Calls {@link #onSetVolume}.
		* Calls {@link #onSetStreamVolume}.
		*/
		void setVolume(float volume) {
		onSetVolume(volume);
		onSetStreamVolume(volume);
		}

		/**
		@@ -565,33 +562,33 @@ public abstract class TvInputService extends Service {
		if (DEBUG) Log.d(TAG, "dispatchInputEvent(" + event + ")");
		if (event instanceof KeyEvent) {
		if (((KeyEvent) event).dispatch(this, mDispatcherState, this)) {
		return Session.DISPATCH_HANDLED;
		return TvInputManager.Session.DISPATCH_HANDLED;
		}
		} else if (event instanceof MotionEvent) {
		MotionEvent motionEvent = (MotionEvent) event;
		final int source = motionEvent.getSource();
		if (motionEvent.isTouchEvent()) {
		if (onTouchEvent(motionEvent)) {
		return Session.DISPATCH_HANDLED;
		return TvInputManager.Session.DISPATCH_HANDLED;
		}
		} else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
		if (onTrackballEvent(motionEvent)) {
		return Session.DISPATCH_HANDLED;
		return TvInputManager.Session.DISPATCH_HANDLED;
		}
		} else {
		if (onGenericMotionEvent(motionEvent)) {
		return Session.DISPATCH_HANDLED;
		return TvInputManager.Session.DISPATCH_HANDLED;
		}
		}
		}
		if (mOverlayView == null \|\| !mOverlayView.isAttachedToWindow()) {
		return Session.DISPATCH_NOT_HANDLED;
		return TvInputManager.Session.DISPATCH_NOT_HANDLED;
		}
		if (!mOverlayView.hasWindowFocus()) {
		mOverlayView.getViewRootImpl().windowFocusChanged(true, true);
		}
		mOverlayView.getViewRootImpl().dispatchInputEvent(event, receiver);
		return Session.DISPATCH_IN_PROGRESS;
		return TvInputManager.Session.DISPATCH_IN_PROGRESS;
		}

		private void setSessionCallback(ITvInputSessionCallback callback) {
		@@ -611,7 +608,7 @@ public abstract class TvInputService extends Service {
		InputChannel channel = (InputChannel) args.arg1;
		ITvInputSessionCallback cb = (ITvInputSessionCallback) args.arg2;
		try {
		TvInputSessionImpl sessionImpl = onCreateSession();
		Session sessionImpl = onCreateSession();
		if (sessionImpl == null) {
		// Failed to create a session.
		cb.onSessionCreated(null);