TIF: Revisit availability changes (969167dc) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,7 @@ LOCAL_SRC_FILES += \
		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/ITvInputManagerCallback.aidl \
		media/java/android/media/tv/ITvInputService.aidl \
		media/java/android/media/tv/ITvInputServiceCallback.aidl \
		media/java/android/media/tv/ITvInputSession.aidl \

api/current.txt

+7 −2

Original line number	Diff line number	Diff line
		@@ -16425,8 +16425,13 @@ package android.media.tv {
		}

		public final class TvInputManager {
		method public boolean getAvailability(java.lang.String);
		method public int getInputState(java.lang.String);
		method public java.util.List<android.media.tv.TvInputInfo> getTvInputList();
		method public void registerListener(android.media.tv.TvInputManager.TvInputListener, android.os.Handler);
		method public void unregisterListener(android.media.tv.TvInputManager.TvInputListener);
		field public static final int INPUT_STATE_CONNECTED = 0; // 0x0
		field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
		field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
		field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
		field public static final int VIDEO_UNAVAILABLE_REASON_TUNE = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0
		@@ -16435,7 +16440,7 @@ package android.media.tv {

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

		public abstract class TvInputService extends android.app.Service {

media/java/android/media/tv/ITvInputClient.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.view.InputChannel;
		*/
		oneway interface ITvInputClient {
		void onSessionCreated(in String inputId, IBinder token, in InputChannel channel, int seq);
		void onAvailabilityChanged(in String inputId, boolean isAvailable);
		void onSessionReleased(int seq);
		void onSessionEvent(in String name, in Bundle args, int seq);
		void onChannelRetuned(in Uri channelUri, int seq);

media/java/android/media/tv/ITvInputManager.aidl

+10 −6

Original line number	Diff line number	Diff line
		@@ -18,9 +18,10 @@ package android.media.tv;

		import android.content.ComponentName;
		import android.graphics.Rect;
		import android.media.tv.ITvInputClient;
		import android.media.tv.ITvInputHardware;
		import android.media.tv.ITvInputHardwareCallback;
		import android.media.tv.ITvInputClient;
		import android.media.tv.ITvInputManagerCallback;
		import android.media.tv.TvInputHardwareInfo;
		import android.media.tv.TvInputInfo;
		import android.media.tv.TvTrackInfo;
		@@ -34,10 +35,8 @@ import android.view.Surface;
		interface ITvInputManager {
		List<TvInputInfo> getTvInputList(int userId);

		boolean getAvailability(in ITvInputClient client, in String inputId, int userId);

		void registerCallback(in ITvInputClient client, in String inputId, int userId);
		void unregisterCallback(in ITvInputClient client, in String inputId, int userId);
		void registerCallback(in ITvInputManagerCallback callback, int userId);
		void unregisterCallback(in ITvInputManagerCallback callback, int userId);

		void createSession(in ITvInputClient client, in String inputId, int seq, int userId);
		void releaseSession(in IBinder sessionToken, int userId);
		@@ -56,7 +55,12 @@ interface ITvInputManager {

		// For TV input hardware binding
		List<TvInputHardwareInfo> getHardwareList();
		/*
		* All TvInputServices which want to use hardware must call this method on
		* BOOT_COMPLETE.
		*/
		void registerTvInputInfo(in TvInputInfo info, int deviceId);
		ITvInputHardware acquireTvInputHardware(int deviceId, in ITvInputHardwareCallback callback,
		int userId);
		in TvInputInfo info, int userId);
		void releaseTvInputHardware(int deviceId, in ITvInputHardware hardware, int userId);
		}

media/java/android/media/tv/ITvInputManagerCallback.aidl

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.tv;

		/**
		* Interface to receive callbacks from ITvInputManager regardless of sessions.
		* @hide
		*/
		oneway interface ITvInputManagerCallback {
		void onInputStateChanged(in String inputId, int state);
		}