Merge "Moving TRM under a separate package Change the... (e891f575) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,8 +109,8 @@ import android.media.session.MediaSessionManager;
		import android.media.soundtrigger.SoundTriggerManager;
		import android.media.tv.ITvInputManager;
		import android.media.tv.TvInputManager;
		import android.media.tv.tuner.ITunerResourceManager;
		import android.media.tv.tuner.TunerResourceManager;
		import android.media.tv.tunerresourcemanager.ITunerResourceManager;
		import android.media.tv.tunerresourcemanager.TunerResourceManager;
		import android.net.ConnectivityDiagnosticsManager;
		import android.net.ConnectivityManager;
		import android.net.ConnectivityThread;

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		filegroup {
		name: "framework-media-tv-tunerresourcemanager-sources",
		srcs: [
		"*.java",
		"*.aidl",
		],
		path: ".",
		}

		java_library {
		name: "framework-media-tv-trm-sources",
		srcs: [":framework-media-tv-tunerresourcemanager-sources"],
		installable: true,
		visibility: [
		"//frameworks/base",
		],
		}
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package android.media.tv.tuner;
		package android.media.tv.tunerresourcemanager;

		/**
		* A wrapper of a cas session requests that contains all the request info of the client.

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package android.media.tv.tuner;
		package android.media.tv.tunerresourcemanager;

		import android.annotation.NonNull;
		import android.os.Parcel;

+4 −4

Original line number	Diff line number	Diff line
		@@ -14,20 +14,20 @@
		* limitations under the License.
		*/

		package android.media.tv.tuner;
		package android.media.tv.tunerresourcemanager;

		/**
		* Interface to receive callbacks from ITunerResourceManager.
		*
		* @hide
		*/
		oneway interface ITunerResourceManagerListener {
		oneway interface IResourcesReclaimListener {
		/*
		* TRM invokes this method when the client's resources need to be reclaimed.
		*
		* <p>This method is implemented in Tuner Framework to take the reclaiming
		* actions. It's a synchonized call. TRM would wait on the call to finish
		* actions. It's a synchronous call. TRM would wait on the call to finish
		* then grant the resource.
		*/
		void onResourcesReclaim();
		void onReclaimResources();
		}
		No newline at end of file