Merge "Address API Review comments: MediaCas, Tuner and TunerResourceManager" into main (3fede68d) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -7779,7 +7779,7 @@ package android.media {
		}

		public final class MediaCas implements java.lang.AutoCloseable {
		method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceHolderRetain(boolean);
		method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceOwnershipRetention(boolean);
		method @FlaggedApi("android.media.tv.flags.mediacas_update_client_profile_priority") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public boolean updateResourcePriority(int, int);
		}

		@@ -8692,8 +8692,8 @@ package android.media.tv.tuner {
		method public int setLnaEnabled(boolean);
		method public int setMaxNumberOfFrontends(int, @IntRange(from=0) int);
		method public void setOnTuneEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.OnTuneEventListener);
		method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceHolderRetain(boolean);
		method public void setResourceLostListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.Tuner.OnResourceLostListener);
		method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceOwnershipRetention(boolean);
		method public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);
		method public int transferOwner(@NonNull android.media.tv.tuner.Tuner);
		method public int tune(@NonNull android.media.tv.tuner.frontend.FrontendSettings);

media/java/android/media/MediaCas.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1010,17 +1010,17 @@ public final class MediaCas implements AutoCloseable {
		* scenario, when both resource holder and resource challenger have same processId and same
		* priority.
		*
		* @param resourceHolderRetain Set to {@code true} to allow the resource holder to retain
		* ownership, or false to allow the resource challenger to acquire the resource.
		* If not explicitly set, resourceHolderRetain is set to {@code false}.
		*@param enabled Set to {@code true} to allow the resource holder to retain ownership,
		* or false to allow the resource challenger to acquire the resource.
		* If not explicitly set, enabled is set to {@code false}.
		* @hide
		*/
		@FlaggedApi(FLAG_SET_RESOURCE_HOLDER_RETAIN)
		@SystemApi
		@RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)
		public void setResourceHolderRetain(boolean resourceHolderRetain) {
		public void setResourceOwnershipRetention(boolean enabled) {
		if (mTunerResourceManager != null) {
		mTunerResourceManager.setResourceHolderRetain(mClientId, resourceHolderRetain);
		mTunerResourceManager.setResourceOwnershipRetention(mClientId, enabled);
		}
		}

media/java/android/media/tv/flags/media_tv.aconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ flag {
		name: "set_resource_holder_retain"
		is_exported: true
		namespace: "media_tv"
		description: "Feature flag to add setResourceHolderRetain api to MediaCas and Tuner JAVA."
		description: "Feature flag to add setResourceOwnershipRetention api to MediaCas and Tuner JAVA."
		bug: "372973197"
		}

media/java/android/media/tv/tuner/Tuner.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -757,14 +757,14 @@ public class Tuner implements AutoCloseable {
		* scenario, when both resource holder and resource challenger have same processId and same
		* priority.
		*
		* @param resourceHolderRetain Set to true to allow the resource holder to retain ownership, or
		* false to allow the resource challenger to acquire the resource. If not explicitly set,
		* resourceHolderRetain is set to false.
		* @param enabled Set to {@code true} to allow the resource holder to retain ownership,
		* or false to allow the resource challenger to acquire the resource.
		* If not explicitly set, enabled is set to {@code false}.
		*/
		@FlaggedApi(FLAG_SET_RESOURCE_HOLDER_RETAIN)
		@RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)
		public void setResourceHolderRetain(boolean resourceHolderRetain) {
		mTunerResourceManager.setResourceHolderRetain(mClientId, resourceHolderRetain);
		public void setResourceOwnershipRetention(boolean enabled) {
		mTunerResourceManager.setResourceOwnershipRetention(mClientId, enabled);
		}

		/**

media/java/android/media/tv/tunerresourcemanager/TunerResourceManager.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresFeature;
		import android.annotation.RequiresPermission;
		import android.annotation.SuppressLint;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		@@ -227,15 +228,16 @@ public class TunerResourceManager {
		* scenario, when both resource holder and resource challenger have same processId and same
		* priority.
		*
		* @param clientId The client id used to set ownership of resource to owner in case of resource
		* @param clientId The client id used to set ownership of resource in case of resource
		* challenger situation.
		* @param resourceHolderRetain Set to true to allow the resource holder to retain ownership, or
		* false to allow the resource challenger to acquire the resource. If not explicitly set,
		* resourceHolderRetain is set to false.
		* @param enabled Set to {@code true} to allow the resource holder to retain ownership,
		* or false to allow the resource challenger to acquire the resource.
		* If not explicitly set, enabled is set to {@code false}.
		*/
		public void setResourceHolderRetain(int clientId, boolean resourceHolderRetain) {
		@RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)
		public void setResourceOwnershipRetention(int clientId, boolean enabled) {
		try {
		mService.setResourceHolderRetain(clientId, resourceHolderRetain);
		mService.setResourceOwnershipRetention(clientId, enabled);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}