Merge "Add Wrapper for BroadcastRadioService" (66a31967) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java

+10 −99

Original line number	Diff line number	Diff line
		@@ -17,122 +17,33 @@
		package com.android.server.broadcastradio;

		import android.Manifest;
		import android.annotation.SuppressLint;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.hardware.radio.IAnnouncementListener;
		import android.hardware.radio.ICloseHandle;
		import android.hardware.radio.IRadioService;
		import android.hardware.radio.ITuner;
		import android.hardware.radio.ITunerCallback;
		import android.hardware.radio.RadioManager;
		import android.os.RemoteException;
		import android.util.IndentingPrintWriter;
		import android.util.Slog;

		import com.android.server.SystemService;
		import com.android.server.broadcastradio.hal2.AnnouncementAggregator;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Objects;
		import java.util.OptionalInt;

		public class BroadcastRadioService extends SystemService {
		private static final String TAG = "BcRadioSrv";

		private final ServiceImpl mServiceImpl = new ServiceImpl();

		private final com.android.server.broadcastradio.hal1.BroadcastRadioService mHal1;
		private final com.android.server.broadcastradio.hal2.BroadcastRadioService mHal2;

		private final Object mLock = new Object();
		private final List<RadioManager.ModuleProperties> mV1Modules;

		private final IRadioService mServiceImpl;
		public BroadcastRadioService(Context context) {
		super(context);

		mHal1 = new com.android.server.broadcastradio.hal1.BroadcastRadioService(mLock);
		mV1Modules = mHal1.loadModules();
		OptionalInt max = mV1Modules.stream().mapToInt(RadioManager.ModuleProperties::getId).max();
		mHal2 = new com.android.server.broadcastradio.hal2.BroadcastRadioService(
		max.isPresent() ? max.getAsInt() + 1 : 0, mLock);
		mServiceImpl = new BroadcastRadioServiceHidl(this);
		}

		@Override
		public void onStart() {
		publishBinderService(Context.RADIO_SERVICE, mServiceImpl);
		Slog.v(TAG, "BroadcastRadioService onStart()");
		publishBinderService(Context.RADIO_SERVICE, mServiceImpl.asBinder());
		}

		private class ServiceImpl extends IRadioService.Stub {
		private void enforcePolicyAccess() {
		if (PackageManager.PERMISSION_GRANTED != getContext().checkCallingPermission(
		Manifest.permission.ACCESS_BROADCAST_RADIO)) {
		@SuppressLint("AndroidFrameworkRequiresPermission")
		void enforcePolicyAccess() {
		if (getContext().checkCallingPermission(Manifest.permission.ACCESS_BROADCAST_RADIO)
		!= PackageManager.PERMISSION_GRANTED) {
		throw new SecurityException("ACCESS_BROADCAST_RADIO permission not granted");
		}
		}

		@Override
		public List<RadioManager.ModuleProperties> listModules() {
		Slog.v(TAG, "Listing HIDL modules");
		enforcePolicyAccess();
		List<RadioManager.ModuleProperties> modules = new ArrayList<>();
		modules.addAll(mV1Modules);
		modules.addAll(mHal2.listModules());
		return modules;
		}

		@Override
		public ITuner openTuner(int moduleId, RadioManager.BandConfig bandConfig,
		boolean withAudio, ITunerCallback callback) throws RemoteException {
		Slog.v(TAG, "Opening module " + moduleId);
		enforcePolicyAccess();
		if (callback == null) {
		throw new IllegalArgumentException("Callback must not be empty");
		}
		synchronized (mLock) {
		if (mHal2.hasModule(moduleId)) {
		return mHal2.openSession(moduleId, bandConfig, withAudio, callback);
		} else {
		return mHal1.openTuner(moduleId, bandConfig, withAudio, callback);
		}
		}
		}

		@Override
		public ICloseHandle addAnnouncementListener(int[] enabledTypes,
		IAnnouncementListener listener) {
		Slog.v(TAG, "Adding announcement listener for " + Arrays.toString(enabledTypes));
		Objects.requireNonNull(enabledTypes);
		Objects.requireNonNull(listener);
		enforcePolicyAccess();

		synchronized (mLock) {
		if (!mHal2.hasAnyModules()) {
		Slog.i(TAG, "There are no HAL 2.0 modules registered");
		return new AnnouncementAggregator(listener, mLock);
		}

		return mHal2.addAnnouncementListener(enabledTypes, listener);
		}
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		IndentingPrintWriter radioPw = new IndentingPrintWriter(pw);
		radioPw.printf("BroadcastRadioService\n");
		radioPw.increaseIndent();
		radioPw.printf("HAL1: %s\n", mHal1);
		radioPw.increaseIndent();
		radioPw.printf("Modules of HAL1: %s\n", mV1Modules);
		radioPw.decreaseIndent();
		radioPw.printf("HAL2:\n");
		radioPw.increaseIndent();
		mHal2.dumpInfo(radioPw);
		radioPw.decreaseIndent();
		radioPw.decreaseIndent();
		}
		}
		}

services/core/java/com/android/server/broadcastradio/BroadcastRadioServiceHidl.java

0 → 100644

+137 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (C) 2022 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 com.android.server.broadcastradio;

		import android.hardware.radio.IAnnouncementListener;
		import android.hardware.radio.ICloseHandle;
		import android.hardware.radio.IRadioService;
		import android.hardware.radio.ITuner;
		import android.hardware.radio.ITunerCallback;
		import android.hardware.radio.RadioManager;
		import android.os.RemoteException;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.Slog;

		import com.android.server.broadcastradio.hal2.AnnouncementAggregator;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.List;
		import java.util.Objects;
		import java.util.OptionalInt;

		/**
		* Wrapper for HIDL interface for BroadcastRadio HAL
		*/
		final class BroadcastRadioServiceHidl extends IRadioService.Stub {
		private static final String TAG = "BcRadioSrvHidl";

		private final com.android.server.broadcastradio.hal1.BroadcastRadioService mHal1;
		private final com.android.server.broadcastradio.hal2.BroadcastRadioService mHal2;

		private final Object mLock = new Object();

		private final BroadcastRadioService mService;
		private final List<RadioManager.ModuleProperties> mV1Modules;

		BroadcastRadioServiceHidl(BroadcastRadioService service) {
		mService = Objects.requireNonNull(service);
		mHal1 = new com.android.server.broadcastradio.hal1.BroadcastRadioService(mLock);
		mV1Modules = mHal1.loadModules();
		OptionalInt max = mV1Modules.stream().mapToInt(RadioManager.ModuleProperties::getId).max();
		mHal2 = new com.android.server.broadcastradio.hal2.BroadcastRadioService(
		max.isPresent() ? max.getAsInt() + 1 : 0, mLock);
		}

		@Override
		public List<RadioManager.ModuleProperties> listModules() {
		mService.enforcePolicyAccess();
		Collection<RadioManager.ModuleProperties> v2Modules = mHal2.listModules();
		List<RadioManager.ModuleProperties> modules = new ArrayList<>(
		mV1Modules.size() + v2Modules.size());
		modules.addAll(mV1Modules);
		modules.addAll(v2Modules);
		return modules;
		}

		@Override
		public ITuner openTuner(int moduleId, RadioManager.BandConfig bandConfig,
		boolean withAudio, ITunerCallback callback) throws RemoteException {
		if (isDebugEnabled()) {
		Slog.d(TAG, "Opening module " + moduleId);
		}
		mService.enforcePolicyAccess();
		Objects.requireNonNull(callback, "Callback must not be null");
		synchronized (mLock) {
		if (mHal2.hasModule(moduleId)) {
		return mHal2.openSession(moduleId, bandConfig, withAudio, callback);
		} else {
		return mHal1.openTuner(moduleId, bandConfig, withAudio, callback);
		}
		}
		}

		@Override
		public ICloseHandle addAnnouncementListener(int[] enabledTypes,
		IAnnouncementListener listener) {
		if (isDebugEnabled()) {
		Slog.d(TAG, "Adding announcement listener for " + Arrays.toString(enabledTypes));
		}
		Objects.requireNonNull(enabledTypes);
		Objects.requireNonNull(listener);
		mService.enforcePolicyAccess();

		synchronized (mLock) {
		if (!mHal2.hasAnyModules()) {
		Slog.w(TAG, "There are no HAL 2.0 modules registered");
		return new AnnouncementAggregator(listener, mLock);
		}

		return mHal2.addAnnouncementListener(enabledTypes, listener);
		}
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		IndentingPrintWriter radioPw = new IndentingPrintWriter(pw);
		radioPw.printf("BroadcastRadioService\n");

		radioPw.increaseIndent();
		radioPw.printf("HAL1: %s\n", mHal1);

		radioPw.increaseIndent();
		radioPw.printf("Modules of HAL1: %s\n", mV1Modules);
		radioPw.decreaseIndent();

		radioPw.printf("HAL2:\n");

		radioPw.increaseIndent();
		mHal2.dumpInfo(radioPw);
		radioPw.decreaseIndent();

		radioPw.decreaseIndent();
		}


		private static boolean isDebugEnabled() {
		return Log.isLoggable(TAG, Log.DEBUG);
		}
		}