Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a89a52d6 authored by Kensuke Miyagi's avatar Kensuke Miyagi
Browse files

Reclaim sharee's resource upon owner's close() 

Also convert the unsupported exception across process to simply
returning error for requestFrontend.

Bug: 206726672
Test: android.media.tv.tuner.cts.TunerTest#testClose()
Change-Id: I13c4b9438bcbd1382f923939d25e7cf2070a617c
parent 17c4a944

services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java

+10 −6
Original line number Diff line number Diff line
@@ -243,21 +243,24 @@ public class TunerResourceManagerService extends SystemService implements IBinde 


        @Override

        public boolean requestFrontend(@NonNull TunerFrontendRequest request,

                @NonNull int[] frontendHandle) throws RemoteException {

                @NonNull int[] frontendHandle) {

            enforceTunerAccessPermission("requestFrontend");

            enforceTrmAccessPermission("requestFrontend");

            if (frontendHandle == null) {

                throw new RemoteException("frontendHandle can't be null");

                Slog.e(TAG, "frontendHandle can't be null");

                return false;

            }

            synchronized (mLock) {

                if (!checkClientExists(request.clientId)) {

                    throw new RemoteException("Request frontend from unregistered client: "

                    Slog.e(TAG, "Request frontend from unregistered client: "

                            + request.clientId);

                    return false;

                }

                // If the request client is holding or sharing a frontend, throw an exception.

                if (!getClientProfile(request.clientId).getInUseFrontendHandles().isEmpty()) {

                    throw new RemoteException("Release frontend before requesting another one. "

                            + "Client id: " + request.clientId);

                    Slog.e(TAG, "Release frontend before requesting another one. Client id: "

                            + request.clientId);

                    return false;

                }

                return requestFrontendInternal(request, frontendHandle);

            }
@@ -1153,7 +1156,8 @@ public class TunerResourceManagerService extends SystemService implements IBinde 
            ClientProfile ownerClient = getClientProfile(fe.getOwnerClientId());

            if (ownerClient != null) {

                for (int shareOwnerId : ownerClient.getShareFeClientIds()) {

                    clearFrontendAndClientMapping(getClientProfile(shareOwnerId));

                    reclaimResource(shareOwnerId,

                            TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND);

                }

            }

        }