Merge "TunerResourceManager: Add API to determine Resource Ownership." into main (2f54a9ba) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -22668,7 +22668,6 @@ package android.media {
		method public void sendEvent(int, int, @Nullable byte[]) throws android.media.MediaCasException;
		method public void setEventListener(@Nullable android.media.MediaCas.EventListener, @Nullable android.os.Handler);
		method public void setPrivateData(@NonNull byte[]) throws android.media.MediaCasException;
		method @FlaggedApi("com.android.media.flags.update_client_profile_priority") public boolean updateResourcePriority(int, int);
		field public static final int PLUGIN_STATUS_PHYSICAL_MODULE_CHANGED = 0; // 0x0
		field public static final int PLUGIN_STATUS_SESSION_NUMBER_CHANGED = 1; // 0x1
		field public static final int SCRAMBLING_MODE_AES128 = 9; // 0x9

core/api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -7581,6 +7581,11 @@ package android.media {
		method @NonNull public android.media.HwAudioSource.Builder setAudioDeviceInfo(@NonNull android.media.AudioDeviceInfo);
		}

		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("com.android.media.flags.update_client_profile_priority") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public boolean updateResourcePriority(int, int);
		}

		public final class MediaCodec {
		method @NonNull @RequiresPermission(android.Manifest.permission.MEDIA_RESOURCE_OVERRIDE_PID) public static android.media.MediaCodec createByCodecNameForClient(@NonNull String, int, int) throws java.io.IOException;
		}
		@@ -8353,6 +8358,7 @@ 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 public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);
		method public int transferOwner(@NonNull android.media.tv.tuner.Tuner);

media/java/android/media/MediaCas.java

+24 −0

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

		package android.media;

		import static android.media.tv.flags.Flags.FLAG_SET_RESOURCE_HOLDER_RETAIN;

		import static com.android.media.flags.Flags.FLAG_UPDATE_CLIENT_PROFILE_PRIORITY;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.content.Context;
		import android.hardware.cas.AidlCasPluginDescriptor;
		@@ -990,12 +994,32 @@ public final class MediaCas implements AutoCloseable {
		* @param priority the new priority. Any negative value would cause no-op on priority setting
		* and the API would only process nice value setting in that case.
		* @param niceValue the nice value.
		* @hide
		*/
		@FlaggedApi(FLAG_UPDATE_CLIENT_PROFILE_PRIORITY)
		@SystemApi
		@RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)
		public boolean updateResourcePriority(int priority, int niceValue) {
		return mTunerResourceManager.updateClientPriority(mClientId, priority, niceValue);
		}

		/**
		* Determines whether the resource holder retains ownership of the resource during a challenge
		* 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}.
		* @hide
		*/
		@FlaggedApi(FLAG_SET_RESOURCE_HOLDER_RETAIN)
		@SystemApi
		@RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)
		public void setResourceHolderRetain(boolean resourceHolderRetain) {
		mTunerResourceManager.setResourceHolderRetain(mClientId, resourceHolderRetain);
		}

		IHwBinder getBinder() {
		if (mICas != null) {
		return null; // Return IHwBinder only for HIDL

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -72,3 +72,11 @@ flag {
		description: "Standardize AIDL Extension Interface of TIS"
		bug: "330366987"
		}

		flag {
		name: "set_resource_holder_retain"
		is_exported: true
		namespace: "media_tv"
		description : "Feature flag to add setResourceHolderRetain api to MediaCas and Tuner JAVA."
		bug: "372973197"
		}

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.media.tv.tuner;

		import static android.media.tv.flags.Flags.FLAG_SET_RESOURCE_HOLDER_RETAIN;

		import android.annotation.BytesLong;
		import android.annotation.CallbackExecutor;
		import android.annotation.FlaggedApi;
		@@ -750,6 +752,21 @@ public class Tuner implements AutoCloseable {
		mTunerResourceManager.updateClientPriority(mClientId, priority, niceValue);
		}

		/**
		* Determines whether the resource holder retains ownership of the resource during a challenge
		* 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.
		*/
		@FlaggedApi(FLAG_SET_RESOURCE_HOLDER_RETAIN)
		@RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)
		public void setResourceHolderRetain(boolean resourceHolderRetain) {
		mTunerResourceManager.setResourceHolderRetain(mClientId, resourceHolderRetain);
		}

		/**
		* Checks if there is an unused frontend resource available.
		*