Merge "[CEC Configuration] Add listener system API" (894acd91) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -2738,6 +2738,8 @@ package android.hardware.hdmi {
		}

		public final class HdmiControlManager {
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void addHdmiCecEnabledChangeListener(@NonNull android.hardware.hdmi.HdmiControlManager.CecSettingChangeListener);
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void addHdmiCecEnabledChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.hdmi.HdmiControlManager.CecSettingChangeListener);
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void addHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void addHotplugEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.hdmi.HdmiControlManager.HotplugEventListener);
		method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public java.util.List<java.lang.Integer> getAllowedCecSettingIntValues(@NonNull String);
		@@ -2756,6 +2758,7 @@ package android.hardware.hdmi {
		method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public java.util.List<java.lang.String> getUserCecSettings();
		method public boolean isDeviceConnected(@NonNull android.hardware.hdmi.HdmiDeviceInfo);
		method public void powerOffDevice(@NonNull android.hardware.hdmi.HdmiDeviceInfo);
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void removeHdmiCecEnabledChangeListener(@NonNull android.hardware.hdmi.HdmiControlManager.CecSettingChangeListener);
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void removeHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);
		method public void setActiveSource(@NonNull android.hardware.hdmi.HdmiDeviceInfo);
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setHdmiCecEnabled(@NonNull int);
		@@ -2868,6 +2871,10 @@ package android.hardware.hdmi {
		field public static final int TIMER_STATUS_PROGRAMMED_INFO_NO_MEDIA_INFO = 10; // 0xa
		}

		public static interface HdmiControlManager.CecSettingChangeListener {
		method public void onChange(@NonNull String);
		}

		@IntDef({android.hardware.hdmi.HdmiControlManager.RESULT_SUCCESS, android.hardware.hdmi.HdmiControlManager.RESULT_TIMEOUT, android.hardware.hdmi.HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE, android.hardware.hdmi.HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE, android.hardware.hdmi.HdmiControlManager.RESULT_ALREADY_IN_PROGRESS, android.hardware.hdmi.HdmiControlManager.RESULT_EXCEPTION, android.hardware.hdmi.HdmiControlManager.RESULT_INCORRECT_MODE, android.hardware.hdmi.HdmiControlManager.RESULT_COMMUNICATION_FAILED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface HdmiControlManager.ControlCallbackResult {
		}

core/java/android/hardware/hdmi/HdmiControlManager.java

+128 −0

Original line number	Diff line number	Diff line
		@@ -1371,6 +1371,87 @@ public final class HdmiControlManager {
		};
		}

		/**
		* Listener used to get setting change notification.
		*
		* @hide
		*/
		@SystemApi
		public interface CecSettingChangeListener {
		/**
		* Called when value of a setting changes.
		*
		* @param setting name of a CEC setting that changed
		*/
		void onChange(@NonNull @CecSettingName String setting);
		}

		private final ArrayMap<String,
		ArrayMap<CecSettingChangeListener, IHdmiCecSettingChangeListener>>
		mCecSettingChangeListeners = new ArrayMap<>();

		private void addCecSettingChangeListener(
		@NonNull @CecSettingName String setting,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull CecSettingChangeListener listener) {
		if (mService == null) {
		Log.e(TAG, "HdmiControlService is not available");
		return;
		}
		if (mCecSettingChangeListeners.containsKey(setting)
		&& mCecSettingChangeListeners.get(setting).containsKey(listener)) {
		Log.e(TAG, "listener is already registered");
		return;
		}
		IHdmiCecSettingChangeListener wrappedListener =
		getCecSettingChangeListenerWrapper(executor, listener);
		if (!mCecSettingChangeListeners.containsKey(setting)) {
		mCecSettingChangeListeners.put(setting, new ArrayMap<>());
		}
		mCecSettingChangeListeners.get(setting).put(listener, wrappedListener);
		try {
		mService.addCecSettingChangeListener(setting, wrappedListener);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		private void removeCecSettingChangeListener(
		@NonNull @CecSettingName String setting,
		@NonNull CecSettingChangeListener listener) {
		if (mService == null) {
		Log.e(TAG, "HdmiControlService is not available");
		return;
		}
		IHdmiCecSettingChangeListener wrappedListener =
		!mCecSettingChangeListeners.containsKey(setting) ? null :
		mCecSettingChangeListeners.get(setting).remove(listener);
		if (wrappedListener == null) {
		Log.e(TAG, "tried to remove not-registered listener");
		return;
		}
		try {
		mService.removeCecSettingChangeListener(setting, wrappedListener);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		private IHdmiCecSettingChangeListener getCecSettingChangeListenerWrapper(
		Executor executor, final CecSettingChangeListener listener) {
		return new IHdmiCecSettingChangeListener.Stub() {
		@Override
		public void onChange(String setting) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> listener.onChange(setting));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		};
		}

		/**
		* Get a set of user-modifiable settings.
		*
		@@ -1492,6 +1573,53 @@ public final class HdmiControlManager {
		}
		}

		/**
		* Add change listener for global status of HDMI CEC.
		*
		* <p>To stop getting the notification,
		* use {@link #removeHdmiCecEnabledChangeListener(CecSettingChangeListener)}.
		*
		* Note that each invocation of the callback will be executed on an arbitrary
		* Binder thread. This means that all callback implementations must be
		* thread safe. To specify the execution thread, use
		* {@link addHdmiCecEnabledChangeListener(Executor, CecSettingChangeListener)}.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.HDMI_CEC)
		public void addHdmiCecEnabledChangeListener(@NonNull CecSettingChangeListener listener) {
		addHdmiCecEnabledChangeListener(ConcurrentUtils.DIRECT_EXECUTOR, listener);
		}

		/**
		* Add change listener for global status of HDMI CEC.
		*
		* <p>To stop getting the notification,
		* use {@link #removeHdmiCecEnabledChangeListener(CecSettingChangeListener)}.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.HDMI_CEC)
		public void addHdmiCecEnabledChangeListener(
		@NonNull @CallbackExecutor Executor executor,
		@NonNull CecSettingChangeListener listener) {
		addCecSettingChangeListener(CEC_SETTING_NAME_HDMI_CEC_ENABLED, executor, listener);
		}

		/**
		* Remove change listener for global status of HDMI CEC.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.HDMI_CEC)
		public void removeHdmiCecEnabledChangeListener(
		@NonNull CecSettingChangeListener listener) {
		removeCecSettingChangeListener(CEC_SETTING_NAME_HDMI_CEC_ENABLED, listener);
		}

		/**
		* Set the version of the HDMI CEC specification currently used.
		*

core/java/android/hardware/hdmi/HdmiControlServiceWrapper.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,18 @@ public final class HdmiControlServiceWrapper {
		HdmiControlServiceWrapper.this.removeHdmiCecVolumeControlFeatureListener(listener);
		}

		@Override
		public void addCecSettingChangeListener(String name,
		IHdmiCecSettingChangeListener listener) {
		HdmiControlServiceWrapper.this.addCecSettingChangeListener(name, listener);
		}

		@Override
		public void removeCecSettingChangeListener(String name,
		IHdmiCecSettingChangeListener listener) {
		HdmiControlServiceWrapper.this.removeCecSettingChangeListener(name, listener);
		}

		@Override
		public List<String> getUserCecSettings() {
		return HdmiControlServiceWrapper.this.getUserCecSettings();
		@@ -521,6 +533,14 @@ public final class HdmiControlServiceWrapper {
		public void removeHdmiCecVolumeControlFeatureListener(
		IHdmiCecVolumeControlFeatureListener listener) {}

		/** @hide */
		public void addCecSettingChangeListener(String name,
		IHdmiCecSettingChangeListener listener) {}

		/** @hide */
		public void removeCecSettingChangeListener(String name,
		IHdmiCecSettingChangeListener listener) {}

		/** @hide */
		public List<String> getUserCecSettings() {
		return new ArrayList<>();

core/java/android/hardware/hdmi/IHdmiCecSettingChangeListener.aidl

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 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.hardware.hdmi;

		/**
		* Callback interface definition for HDMI client to get informed of
		* CEC setting change.
		*
		* @hide
		*/
		oneway interface IHdmiCecSettingChangeListener {
		void onChange(in String setting);
		}

core/java/android/hardware/hdmi/IHdmiControlService.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.hardware.hdmi;

		import android.hardware.hdmi.HdmiDeviceInfo;
		import android.hardware.hdmi.HdmiPortInfo;
		import android.hardware.hdmi.IHdmiCecSettingChangeListener;
		import android.hardware.hdmi.IHdmiCecVolumeControlFeatureListener;
		import android.hardware.hdmi.IHdmiControlCallback;
		import android.hardware.hdmi.IHdmiControlStatusChangeListener;
		@@ -89,6 +90,8 @@ interface IHdmiControlService {
		boolean isHdmiCecVolumeControlEnabled();
		void reportAudioStatus(int deviceType, int volume, int maxVolume, boolean isMute);
		void setSystemAudioModeOnForAudioOnlySource();
		void addCecSettingChangeListener(String name, IHdmiCecSettingChangeListener listener);
		void removeCecSettingChangeListener(String name, IHdmiCecSettingChangeListener listener);
		List<String> getUserCecSettings();
		List<String> getAllowedCecSettingStringValues(String name);
		int[] getAllowedCecSettingIntValues(String name);