Merge changes from topic "tuner_aidl_fw" (50ef48a5) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -6020,6 +6020,7 @@ package android.media.tv.tuner {
		method public static int getTunerVersion();
		field public static final int TUNER_VERSION_1_0 = 65536; // 0x10000
		field public static final int TUNER_VERSION_1_1 = 65537; // 0x10001
		field public static final int TUNER_VERSION_2_0 = 131072; // 0x20000
		field public static final int TUNER_VERSION_UNKNOWN = 0; // 0x0
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,9 @@ public final class TunerVersionChecker {
		private TunerVersionChecker() {}

		/** @hide */
		@IntDef(prefix = "TUNER_VERSION_", value = {TUNER_VERSION_UNKNOWN, TUNER_VERSION_1_0,
		TUNER_VERSION_1_1})
		@IntDef(prefix = "TUNER_VERSION_",
		value = {TUNER_VERSION_UNKNOWN, TUNER_VERSION_1_0, TUNER_VERSION_1_1,
		TUNER_VERSION_2_0})
		@Retention(RetentionPolicy.SOURCE)
		public @interface TunerVersion {}
		/**
		@@ -54,6 +55,10 @@ public final class TunerVersionChecker {
		* Tuner version 1.1.
		*/
		public static final int TUNER_VERSION_1_1 = ((1 << 16) \| 1);
		/**
		* Tuner version 2.0.
		*/
		public static final int TUNER_VERSION_2_0 = (2 << 16);

		/**
		* Get the current running Tuner version.

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ aidl_interface {
		enabled: true,
		},
		cpp: {
		enabled: true,
		enabled: false,
		},
		ndk: {
		enabled: true,
		@@ -33,5 +33,4 @@ aidl_interface {
		srcs: [
		":framework-media-tv-tunerresourcemanager-sources-aidl",
		],
		imports: ["tv_tuner_frontend_info_aidl_interface"],
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.annotation.RequiresFeature;
		import android.annotation.SystemService;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.media.tv.tuner.TunerFrontendInfo;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.util.Log;

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,13 +16,13 @@

		package android.media.tv.tunerresourcemanager;

		import android.media.tv.tuner.TunerFrontendInfo;
		import android.media.tv.tunerresourcemanager.CasSessionRequest;
		import android.media.tv.tunerresourcemanager.IResourcesReclaimListener;
		import android.media.tv.tunerresourcemanager.ResourceClientProfile;
		import android.media.tv.tunerresourcemanager.TunerCiCamRequest;
		import android.media.tv.tunerresourcemanager.TunerDemuxRequest;
		import android.media.tv.tunerresourcemanager.TunerDescramblerRequest;
		import android.media.tv.tunerresourcemanager.TunerFrontendInfo;
		import android.media.tv.tunerresourcemanager.TunerFrontendRequest;
		import android.media.tv.tunerresourcemanager.TunerLnbRequest;