Merge changes from topic "tuner-rm" (8527147b) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +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.net.ConnectivityDiagnosticsManager;
		import android.net.ConnectivityManager;
		import android.net.ConnectivityThread;
		@@ -937,6 +939,17 @@ public final class SystemServiceRegistry {
		return new TvInputManager(service, ctx.getUserId());
		}});

		registerService(Context.TV_TUNER_RESOURCE_MGR_SERVICE, TunerResourceManager.class,
		new CachedServiceFetcher<TunerResourceManager>() {
		@Override
		public TunerResourceManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		IBinder iBinder =
		ServiceManager.getServiceOrThrow(Context.TV_TUNER_RESOURCE_MGR_SERVICE);
		ITunerResourceManager service = ITunerResourceManager.Stub.asInterface(iBinder);
		return new TunerResourceManager(service, ctx.getUserId());
		}});

		registerService(Context.NETWORK_SCORE_SERVICE, NetworkScoreManager.class,
		new CachedServiceFetcher<NetworkScoreManager>() {
		@Override

core/java/android/content/Context.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -3457,6 +3457,7 @@ public abstract class Context {
		CONSUMER_IR_SERVICE,
		//@hide: TRUST_SERVICE,
		TV_INPUT_SERVICE,
		//@hide: TV_TUNER_RESOURCE_MGR_SERVICE,
		//@hide: NETWORK_SCORE_SERVICE,
		USAGE_STATS_SERVICE,
		MEDIA_SESSION_SERVICE,
		@@ -4756,6 +4757,17 @@ public abstract class Context {
		*/
		public static final String TV_INPUT_SERVICE = "tv_input";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.media.tv.TunerResourceManager} for interacting with TV
		* tuner resources on the device.
		*
		* @see #getSystemService(String)
		* @see android.media.tv.TunerResourceManager
		* @hide
		*/
		public static final String TV_TUNER_RESOURCE_MGR_SERVICE = "tv_tuner_resource_mgr";

		/**
		* {@link android.net.NetworkScoreManager} for managing network scoring.
		* @see #getSystemService(String)

media/java/android/media/tv/tuner/CasSessionRequest.aidl

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 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.tuner;

		/**
		* A wrapper of a cas session requests that contains all the request info of the client.
		*
		* @hide
		*/
		parcelable CasSessionRequest;
		No newline at end of file

media/java/android/media/tv/tuner/CasSessionRequest.java

0 → 100644

+114 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 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.tuner;

		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Log;

		/**
		* Information required to request a Cas Session.
		*
		* @hide
		*/
		public final class CasSessionRequest implements Parcelable {
		static final String TAG = "CasSessionRequest";

		public static final
		@NonNull
		Parcelable.Creator<CasSessionRequest> CREATOR =
		new Parcelable.Creator<CasSessionRequest>() {
		@Override
		public CasSessionRequest createFromParcel(Parcel source) {
		try {
		return new CasSessionRequest(source);
		} catch (Exception e) {
		Log.e(TAG, "Exception creating CasSessionRequest from parcel", e);
		return null;
		}
		}

		@Override
		public CasSessionRequest[] newArray(int size) {
		return new CasSessionRequest[size];
		}
		};

		/**
		* Client id of the client that sends the request.
		*/
		private final int mClientId;

		/**
		* System id of the requested cas.
		*/
		private final int mCasSystemId;

		private CasSessionRequest(@NonNull Parcel source) {
		mClientId = source.readInt();
		mCasSystemId = source.readInt();
		}

		/**
		* Constructs a new {@link CasSessionRequest} with the given parameters.
		*
		* @param clientId id of the client.
		* @param casSystemId the cas system id that the client is requesting.
		*/
		public CasSessionRequest(int clientId,
		int casSystemId) {
		mClientId = clientId;
		mCasSystemId = casSystemId;
		}

		/**
		* Returns the id of the client.
		*/
		public int getClientId() {
		return mClientId;
		}

		/**
		* Returns the cas system id requested.
		*/
		public int getCasSystemId() {
		return mCasSystemId;
		}

		// Parcelable
		@Override
		public int describeContents() {
		return 0;
		}

		@NonNull
		@Override
		public String toString() {
		StringBuilder b = new StringBuilder(128);
		b.append("CasSessionRequest {clientId=").append(mClientId);
		b.append(", casSystemId=").append(mCasSystemId);
		b.append("}");
		return b.toString();
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeInt(mClientId);
		dest.writeInt(mCasSystemId);
		}
		}

media/java/android/media/tv/tuner/ITunerResourceManager.aidl

0 → 100644

+244 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 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.tuner;

		import android.media.tv.tuner.CasSessionRequest;
		import android.media.tv.tuner.ITunerResourceManagerListener;
		import android.media.tv.tuner.ResourceClientProfile;
		import android.media.tv.tuner.TunerFrontendInfo;
		import android.media.tv.tuner.TunerFrontendRequest;
		import android.media.tv.tuner.TunerLnbRequest;

		/**
		* Interface of the Tuner Resource Manager. It manages resources used by TV Tuners.
		* <p>Resources include:
		* <ul>
		* <li>TunerFrontend {@link android.media.tv.tuner.frontend}.
		* <li>TunerLnb {@link android.media.tv.tuner.Lnb}.
		* <li>MediaCas {@link android.media.MediaCas}.
		* <li>TvInputHardware {@link android.media.tv.TvInputHardwareInfo}.
		* <ul>
		*
		* <p>Expected workflow is:
		* <ul>
		* <li>Tuner Java/MediaCas/TIF update resources of the current device with TRM.
		* <li>Client registers its profile through {@link #registerClientProfile(ResourceClientProfile,
		* ITunerResourceManagerListener, int[])}.
		* <li>Client requests resources through request APIs.
		* <li>If the resource needs to be handed to a higher priority client from a lower priority
		* one, TRM calls ITunerResourceManagerListener registered by the lower priority client to release
		* the resource.
		* <ul>
		*
		* @hide
		*/
		interface ITunerResourceManager {
		/*
		* This API is used by the client to register their profile with the Tuner Resource manager.
		*
		* <p>The profile contains information that can show the base priority score of the client.
		*
		* @param profile {@link ResourceClientProfile} profile of the current client
		* @param listener {@link ITunerResourceManagerListener} a callback to
		* reclaim clients' resources when needed.
		* @param clientId returns a clientId from the resource manager when the
		* the client registers its profile.
		*/
		void registerClientProfile(in ResourceClientProfile profile,
		ITunerResourceManagerListener listener, out int[] clientId);

		/*
		* This API is used by the client to unregister their profile with the Tuner Resource manager.
		*
		* @param clientId the client id that needs to be unregistered.
		*/
		void unregisterClientProfile(in int clientId);

		/*
		* Updates a registered client's priority and niceValue.
		*
		* @param clientId the id of the client that is updating its profile.
		* @param priority the priority that the client would like to update to.
		* @param niceValue the nice value that the client would like to update to.
		*
		* @return true if the update is successful.
		*/
		boolean updateClientPriority(in int clientId, in int priority, in int niceValue);

		/*
		* Updates the available Frontend resources information on the current device.
		*
		* <p><strong>Note:</strong> This update must happen before the first
		* {@link #requestFrontend(TunerFrontendRequest,int[])} and {@link #releaseFrontend(int)} call.
		*
		* @param infos an array of the available {@link TunerFrontendInfo} information.
		*/
		void setFrontendInfoList(in TunerFrontendInfo[] infos);

		/*
		* Updates the available Cas resource information on the current device.
		*
		* <p><strong>Note:</strong> This update must happen before the first
		* {@link #requestCasSession(CasSessionRequest, int[])} and {@link #releaseCasSession(int)} call.
		*
		* @param casSystemId id of the updating CAS system.
		* @param maxSessionNum the max session number of the CAS system that is updated.
		*/
		void updateCasInfo(in int casSystemId, in int maxSessionNum);

		/*
		* Updates the available Lnb resource information on the current device.
		*
		* <p><strong>Note:</strong> This update must happen before the first
		* {@link #requestLnb(TunerLnbRequest, int[])} and {@link #releaseLnb(int)} call.
		*
		* @param lnbIds ids of the updating lnbs.
		*/
		void setLnbInfoList(in int[] lnbIds);

		/*
		* This API is used by the Tuner framework to request an available frontend from the TunerHAL.
		*
		* <p>There are three possible scenarios:
		* <ul>
		* <li>If there is frontend available, the API would send the id back.
		*
		* <li>If no Frontend is available but the current request info can show higher priority than
		* other uses of Frontend, the API will send
		* {@link ITunerResourceManagerListener#onResourcesReclaim()} to the {@link Tuner}. Tuner would
		* handle the resource reclaim on the holder of lower priority and notify the holder of its
		* resource loss.
		*
		* <li>If no frontend can be granted, the API would return false.
		* <ul>
		*
		* <p><strong>Note:</strong> {@link #setFrontendInfoList(TunerFrontendInfo[])} must be called
		* before this request.
		*
		* @param request {@link TunerFrontendRequest} information of the current request.
		* @param frontendId a one-element array to return the granted frontendId.
		*
		* @return true if there is frontend granted.
		*/
		boolean requestFrontend(in TunerFrontendRequest request, out int[] frontendId);

		/*
		* Requests to share frontend with an existing client.
		*
		* <p><strong>Note:</strong> {@link #setFrontendInfoList(TunerFrontendInfo[])} must be called
		* before this request.
		*
		* @param selfClientId the id of the client that sends the request.
		* @param targetClientId the id of the client to share the frontend with.
		*/
		void shareFrontend(in int selfClientId, in int targetClientId);

		/*
		* This API is used by the Tuner framework to request an available Cas session. This session
		* needs to be under the CAS system with the id indicated in the {@code request}.
		*
		* <p>There are three possible scenarios:
		* <ul>
		* <li>If there is Cas session available, the API would send the id back.
		*
		* <li>If no Cas session is available but the current request info can show higher priority than
		* other uses of the sessions under the requested CAS system, the API will send
		* {@link ITunerResourceManagerCallback#onResourcesReclaim()} to the {@link Tuner}. Tuner would
		* handle the resource reclaim on the holder of lower priority and notify the holder of its
		* resource loss.
		*
		* <li>If no Cas session can be granted, the API would return false.
		* <ul>
		*
		* <p><strong>Note:</strong> {@link #updateCasInfo(int, int)} must be called before this request.
		*
		* @param request {@link CasSessionRequest} information of the current request.
		* @param sessionResourceId a one-element array to return the granted cas session id.
		*
		* @return true if there is CAS session granted.
		*/
		boolean requestCasSession(in CasSessionRequest request, out int[] sessionResourceId);

		/*
		* This API is used by the Tuner framework to request an available Lnb from the TunerHAL.
		*
		* <p>There are three possible scenarios:
		* <ul>
		* <li>If there is Lnb available, the API would send the id back.
		*
		* <li>If no Lnb is available but the current request has a higher priority than other uses of
		* lnbs, the API will send {@link ITunerResourceManagerCallback#onResourcesReclaim()} to the
		* {@link Tuner}. Tuner would handle the resource reclaim on the holder of lower priority and
		* notify the holder of its resource loss.
		*
		* <li>If no Lnb system can be granted, the API would return false.
		* <ul>
		*
		* <p><strong>Note:</strong> {@link #setLnbInfos(int[])} must be called before this request.
		*
		* @param request {@link TunerLnbRequest} information of the current request.
		* @param lnbId a one-element array to return the granted Lnb id.
		*
		* @return true if there is Lnb granted.
		*/
		boolean requestLnb(in TunerLnbRequest request, out int[] lnbId);

		/*
		* Notifies the TRM that the given frontend has been released.
		*
		* <p>Client must call this whenever it releases a Tuner frontend.
		*
		* <p><strong>Note:</strong> {@link #setFrontendInfoList(TunerFrontendInfo[])} must be called
		* before this release.
		*
		* @param frontendId the id of the released frontend.
		*/
		void releaseFrontend(in int frontendId);

		/*
		* Notifies the TRM that the given Cas session has been released.
		*
		* <p>Client must call this whenever it releases a Cas session.
		*
		* <p><strong>Note:</strong> {@link #updateCasInfo(int, int)} must be called before this release.
		*
		* @param sessionResourceId the id of the released CAS session.
		*/
		void releaseCasSession(in int sessionResourceId);

		/*
		* Notifies the TRM that the Lnb with the given id was released.
		*
		* <p>Client must call this whenever it releases an Lnb.
		*
		* <p><strong>Note:</strong> {@link #setLnbInfos(int[])} must be called before this release.
		*
		* @param lnbId the id of the released Tuner Lnb.
		*/
		void releaseLnb(in int lnbId);

		/*
		* Compare two clients' priority.
		*
		* @param challengerProfile the {@link ResourceClientProfile} of the challenger.
		* @param holderProfile the {@link ResourceClientProfile} of the holder of the resource.
		*
		* @return true if the challenger has higher priority than the holder.
		*/
		boolean isHigherPriority(in ResourceClientProfile challengerProfile,
		in ResourceClientProfile holderProfile);
		}