Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev (3c784d63) · Commits · e / os / android_frameworks_base

Android.mk

+8 −9

Original line number	Diff line number	Diff line
		@@ -216,14 +216,6 @@ LOCAL_SRC_FILES += \
		core/java/android/service/wallpaper/IWallpaperConnection.aidl \
		core/java/android/service/wallpaper/IWallpaperEngine.aidl \
		core/java/android/service/wallpaper/IWallpaperService.aidl \
		core/java/android/tv/ITvInputClient.aidl \
		core/java/android/tv/ITvInputHardware.aidl \
		core/java/android/tv/ITvInputHardwareCallback.aidl \
		core/java/android/tv/ITvInputManager.aidl \
		core/java/android/tv/ITvInputService.aidl \
		core/java/android/tv/ITvInputServiceCallback.aidl \
		core/java/android/tv/ITvInputSession.aidl \
		core/java/android/tv/ITvInputSessionCallback.aidl \
		core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl\
		core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl\
		core/java/android/view/accessibility/IAccessibilityManager.aidl \
		@@ -321,6 +313,14 @@ LOCAL_SRC_FILES += \
		media/java/android/media/session/ISession.aidl \
		media/java/android/media/session/ISessionCallback.aidl \
		media/java/android/media/session/ISessionManager.aidl \
		media/java/android/media/tv/ITvInputClient.aidl \
		media/java/android/media/tv/ITvInputHardware.aidl \
		media/java/android/media/tv/ITvInputHardwareCallback.aidl \
		media/java/android/media/tv/ITvInputManager.aidl \
		media/java/android/media/tv/ITvInputService.aidl \
		media/java/android/media/tv/ITvInputServiceCallback.aidl \
		media/java/android/media/tv/ITvInputSession.aidl \
		media/java/android/media/tv/ITvInputSessionCallback.aidl \
		telecomm/java/com/android/internal/telecomm/ICallService.aidl \
		telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl \
		telecomm/java/com/android/internal/telecomm/ICallServiceLookupResponse.aidl \
		@@ -425,7 +425,6 @@ LOCAL_JAR_PACKAGES := \
		android.test\* \
		android.text\* \
		android.transition\* \
		android.tv\* \
		android.util\* \
		android.view\* \
		android.webkit\* \

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/media/java/android/media/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/app)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/android/app/wearable)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/tv/ITv*)

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

api/current.txt

+154 −154

Original line number	Diff line number	Diff line
		@@ -15853,6 +15853,160 @@ package android.media.session {

		}

		package android.media.tv {

		public final class TvContract {
		method public static final android.net.Uri buildChannelUri(long);
		method public static final android.net.Uri buildChannelsUriForInput(android.content.ComponentName);
		method public static final android.net.Uri buildChannelsUriForInput(android.content.ComponentName, boolean);
		method public static final android.net.Uri buildProgramUri(long);
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
		field public static final java.lang.String AUTHORITY = "com.android.tv";
		}

		public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {
		field public static final java.lang.String COLUMN_PACKAGE_NAME = "package_name";
		}

		public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
		field public static final java.lang.String COLUMN_DATA = "data";
		field public static final java.lang.String COLUMN_DESCRIPTION = "description";
		field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
		field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";
		field public static final java.lang.String COLUMN_LOCKED = "locked";
		field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
		field public static final java.lang.String COLUMN_SERVICE_NAME = "service_name";
		field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
		field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
		field public static final java.lang.String COLUMN_TYPE = "type";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.com.android.tv.channels";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.com.android.tv.channels";
		field public static final android.net.Uri CONTENT_URI;
		field public static final int SERVICE_TYPE_OTHER = 0; // 0x0
		field public static final int SERVICE_TYPE_RADIO = 2; // 0x2
		field public static final int SERVICE_TYPE_TV = 1; // 0x1
		field public static final int TYPE_1SEG = 263168; // 0x40400
		field public static final int TYPE_ATSC_C = 197120; // 0x30200
		field public static final int TYPE_ATSC_M_H = 197120; // 0x30200
		field public static final int TYPE_ATSC_T = 196608; // 0x30000
		field public static final int TYPE_CMMB = 327936; // 0x50100
		field public static final int TYPE_DTMB = 327680; // 0x50000
		field public static final int TYPE_DVB_C = 131584; // 0x20200
		field public static final int TYPE_DVB_C2 = 131585; // 0x20201
		field public static final int TYPE_DVB_H = 131840; // 0x20300
		field public static final int TYPE_DVB_S = 131328; // 0x20100
		field public static final int TYPE_DVB_S2 = 131329; // 0x20101
		field public static final int TYPE_DVB_SH = 132096; // 0x20400
		field public static final int TYPE_DVB_T = 131072; // 0x20000
		field public static final int TYPE_DVB_T2 = 131073; // 0x20001
		field public static final int TYPE_ISDB_C = 262912; // 0x40300
		field public static final int TYPE_ISDB_S = 262656; // 0x40200
		field public static final int TYPE_ISDB_T = 262144; // 0x40000
		field public static final int TYPE_ISDB_TB = 262400; // 0x40100
		field public static final int TYPE_OTHER = 0; // 0x0
		field public static final int TYPE_PASSTHROUGH = 65536; // 0x10000
		field public static final int TYPE_S_DMB = 393472; // 0x60100
		field public static final int TYPE_T_DMB = 393216; // 0x60000
		}

		public static final class TvContract.Programs implements android.media.tv.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";
		field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";
		field public static final java.lang.String COLUMN_DATA = "data";
		field public static final java.lang.String COLUMN_DESCRIPTION = "description";
		field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_GENRE = "genre";
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_TITLE = "title";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.com.android.tv.programs";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.com.android.tv.programs";
		field public static final android.net.Uri CONTENT_URI;
		}

		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 java.lang.String getPackageName();
		method public java.lang.String getServiceName();
		method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
		method public void writeToParcel(android.os.Parcel, int);
		}

		public final class TvInputManager {
		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 tune(android.net.Uri);
		}

		public static abstract class TvInputManager.SessionCallback {
		ctor public TvInputManager.SessionCallback();
		method public void onSessionCreated(android.media.tv.TvInputManager.Session);
		method public void onSessionReleased(android.media.tv.TvInputManager.Session);
		}

		public static abstract class TvInputManager.TvInputListener {
		ctor public TvInputManager.TvInputListener();
		method public void onAvailabilityChanged(java.lang.String, boolean);
		}

		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);
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		}

		public abstract class TvInputService.TvInputSessionImpl implements android.view.KeyEvent.Callback {
		ctor public TvInputService.TvInputSessionImpl();
		method public android.view.View onCreateOverlayView();
		method public boolean onGenericMotionEvent(android.view.MotionEvent);
		method public boolean onKeyDown(int, android.view.KeyEvent);
		method public boolean onKeyLongPress(int, android.view.KeyEvent);
		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 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);
		method public void setOverlayViewEnabled(boolean);
		}

		public class TvView extends android.view.SurfaceView {
		ctor public TvView(android.content.Context);
		ctor public TvView(android.content.Context, android.util.AttributeSet);
		ctor public TvView(android.content.Context, android.util.AttributeSet, int);
		method public void bindTvInput(java.lang.String, android.media.tv.TvInputManager.SessionCallback);
		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 unbindTvInput();
		}

		public static abstract interface TvView.OnUnhandledInputEventListener {
		method public abstract boolean onUnhandledInputEvent(android.view.InputEvent);
		}

		}

		package android.mtp {

		public final class MtpConstants {
		@@ -24790,81 +24944,6 @@ package android.provider {
		field public static final java.lang.String TYPE = "type";
		}

		public final class TvContract {
		method public static final android.net.Uri buildChannelUri(long);
		method public static final android.net.Uri buildChannelsUriForInput(android.content.ComponentName);
		method public static final android.net.Uri buildChannelsUriForInput(android.content.ComponentName, boolean);
		method public static final android.net.Uri buildProgramUri(long);
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
		field public static final java.lang.String AUTHORITY = "com.android.tv";
		}

		public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {
		field public static final java.lang.String COLUMN_PACKAGE_NAME = "package_name";
		}

		public static final class TvContract.Channels implements android.provider.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
		field public static final java.lang.String COLUMN_DATA = "data";
		field public static final java.lang.String COLUMN_DESCRIPTION = "description";
		field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
		field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";
		field public static final java.lang.String COLUMN_LOCKED = "locked";
		field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
		field public static final java.lang.String COLUMN_SERVICE_NAME = "service_name";
		field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
		field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
		field public static final java.lang.String COLUMN_TYPE = "type";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.com.android.tv.channels";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.com.android.tv.channels";
		field public static final android.net.Uri CONTENT_URI;
		field public static final int SERVICE_TYPE_OTHER = 0; // 0x0
		field public static final int SERVICE_TYPE_RADIO = 2; // 0x2
		field public static final int SERVICE_TYPE_TV = 1; // 0x1
		field public static final int TYPE_1SEG = 263168; // 0x40400
		field public static final int TYPE_ATSC_C = 197120; // 0x30200
		field public static final int TYPE_ATSC_M_H = 197120; // 0x30200
		field public static final int TYPE_ATSC_T = 196608; // 0x30000
		field public static final int TYPE_CMMB = 327936; // 0x50100
		field public static final int TYPE_DTMB = 327680; // 0x50000
		field public static final int TYPE_DVB_C = 131584; // 0x20200
		field public static final int TYPE_DVB_C2 = 131585; // 0x20201
		field public static final int TYPE_DVB_H = 131840; // 0x20300
		field public static final int TYPE_DVB_S = 131328; // 0x20100
		field public static final int TYPE_DVB_S2 = 131329; // 0x20101
		field public static final int TYPE_DVB_SH = 132096; // 0x20400
		field public static final int TYPE_DVB_T = 131072; // 0x20000
		field public static final int TYPE_DVB_T2 = 131073; // 0x20001
		field public static final int TYPE_ISDB_C = 262912; // 0x40300
		field public static final int TYPE_ISDB_S = 262656; // 0x40200
		field public static final int TYPE_ISDB_T = 262144; // 0x40000
		field public static final int TYPE_ISDB_TB = 262400; // 0x40100
		field public static final int TYPE_OTHER = 0; // 0x0
		field public static final int TYPE_PASSTHROUGH = 65536; // 0x10000
		field public static final int TYPE_S_DMB = 393472; // 0x60100
		field public static final int TYPE_T_DMB = 393216; // 0x60000
		}

		public static final class TvContract.Programs implements android.provider.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";
		field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";
		field public static final java.lang.String COLUMN_DATA = "data";
		field public static final java.lang.String COLUMN_DESCRIPTION = "description";
		field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_GENRE = "genre";
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_TITLE = "title";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.com.android.tv.programs";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.com.android.tv.programs";
		field public static final android.net.Uri CONTENT_URI;
		}

		public class UserDictionary {
		ctor public UserDictionary();
		field public static final java.lang.String AUTHORITY = "user_dictionary";
		@@ -30031,85 +30110,6 @@ package android.transition {

		}

		package android.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 java.lang.String getPackageName();
		method public java.lang.String getServiceName();
		method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
		method public void writeToParcel(android.os.Parcel, int);
		}

		public final class TvInputManager {
		method public void createSession(java.lang.String, android.tv.TvInputManager.SessionCallback, android.os.Handler);
		method public boolean getAvailability(java.lang.String);
		method public java.util.List<android.tv.TvInputInfo> getTvInputList();
		method public void registerListener(java.lang.String, android.tv.TvInputManager.TvInputListener, android.os.Handler);
		method public void unregisterListener(java.lang.String, android.tv.TvInputManager.TvInputListener);
		}

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

		public static abstract class TvInputManager.SessionCallback {
		ctor public TvInputManager.SessionCallback();
		method public void onSessionCreated(android.tv.TvInputManager.Session);
		method public void onSessionReleased(android.tv.TvInputManager.Session);
		}

		public static abstract class TvInputManager.TvInputListener {
		ctor public TvInputManager.TvInputListener();
		method public void onAvailabilityChanged(java.lang.String, boolean);
		}

		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.tv.TvInputService.TvInputSessionImpl onCreateSession();
		method public final void setAvailable(boolean);
		field public static final java.lang.String SERVICE_INTERFACE = "android.tv.TvInputService";
		}

		public abstract class TvInputService.TvInputSessionImpl implements android.view.KeyEvent.Callback {
		ctor public TvInputService.TvInputSessionImpl();
		method public android.view.View onCreateOverlayView();
		method public boolean onGenericMotionEvent(android.view.MotionEvent);
		method public boolean onKeyDown(int, android.view.KeyEvent);
		method public boolean onKeyLongPress(int, android.view.KeyEvent);
		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 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);
		method public void setOverlayViewEnabled(boolean);
		}

		public class TvView extends android.view.SurfaceView {
		ctor public TvView(android.content.Context);
		ctor public TvView(android.content.Context, android.util.AttributeSet);
		ctor public TvView(android.content.Context, android.util.AttributeSet, int);
		method public void bindTvInput(java.lang.String, android.tv.TvInputManager.SessionCallback);
		method public boolean dispatchUnhandledInputEvent(android.view.InputEvent);
		method public boolean onUnhandledInputEvent(android.view.InputEvent);
		method public void setOnUnhandledInputEventListener(android.tv.TvView.OnUnhandledInputEventListener);
		method public void unbindTvInput();
		}

		public static abstract interface TvView.OnUnhandledInputEventListener {
		method public abstract boolean onUnhandledInputEvent(android.view.InputEvent);
		}

		}

		package android.util {

		public class AndroidException extends java.lang.Exception {

core/java/android/app/ContextImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ import android.location.LocationManager;
		import android.media.AudioManager;
		import android.media.MediaRouter;
		import android.media.session.MediaSessionManager;
		import android.media.tv.ITvInputManager;
		import android.media.tv.TvInputManager;
		import android.net.ConnectivityManager;
		import android.net.IConnectivityManager;
		import android.net.EthernetManager;
		@@ -117,8 +119,6 @@ import android.service.fingerprint.FingerprintManager;
		import android.service.fingerprint.FingerprintManagerReceiver;
		import android.service.fingerprint.FingerprintService;
		import android.telephony.TelephonyManager;
		import android.tv.ITvInputManager;
		import android.tv.TvInputManager;
		import android.content.ClipboardManager;
		import android.util.AndroidRuntimeException;
		import android.util.ArrayMap;

core/java/android/content/Context.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -2742,11 +2742,11 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.tv.TvInputManager} for interacting with TV inputs on the
		* device.
		* {@link android.media.tv.TvInputManager} for interacting with TV inputs
		* on the device.
		*
		* @see #getSystemService
		* @see android.tv.TvInputManager
		* @see android.media.tv.TvInputManager
		*/
		public static final String TV_INPUT_SERVICE = "tv_input";