Merge changes I57ced3b6,Id988ed81,I219bd8f8,I449a775b,I86461203, ... (9efdf42f) · Commits · e / os / android_frameworks_base

core/java/android/hardware/hdmi/HdmiAudioSystemClient.java

+76 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,13 @@
		*/
		package android.hardware.hdmi;

		import android.annotation.Nullable;
		import android.os.Handler;
		import android.os.RemoteException;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.annotations.VisibleForTesting.Visibility;

		/**
		* HdmiAudioSystemClient represents HDMI-CEC logical device of type Audio System in the Android
		* system which acts as an audio system device such as sound bar.
		@@ -27,10 +34,25 @@ package android.hardware.hdmi;
		public final class HdmiAudioSystemClient extends HdmiClient {
		private static final String TAG = "HdmiAudioSystemClient";

		private static final int REPORT_AUDIO_STATUS_INTERVAL_MS = 500;

		private final Handler mHandler;
		private boolean mCanSendAudioStatus = true;
		private boolean mPendingReportAudioStatus;

		private int mLastVolume;
		private int mLastMaxVolume;
		private boolean mLastIsMute;

		@VisibleForTesting(visibility = Visibility.PACKAGE)
		public HdmiAudioSystemClient(IHdmiControlService service) {
		this(service, null);
		}

		/* package */ HdmiAudioSystemClient(IHdmiControlService service) {
		@VisibleForTesting(visibility = Visibility.PACKAGE)
		public HdmiAudioSystemClient(IHdmiControlService service, @Nullable Handler handler) {
		super(service);
		mHandler = handler == null ? new Handler() : handler;
		}

		/** @hide */
		@@ -40,5 +62,58 @@ public final class HdmiAudioSystemClient extends HdmiClient {
		return HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM;
		}

		/**
		* Sends a Report Audio Status HDMI CEC command to TV devices when necessary.
		*
		* According to HDMI CEC specification, an audio system can report its audio status when System
		* Audio Mode is on, so that the TV can display the audio status of external amplifier.
		*
		* @hide
		*/
		public void sendReportAudioStatusCecCommand(boolean isMuteAdjust, int volume, int maxVolume,
		boolean isMute) {
		if (isMuteAdjust) {
		// always report audio status when it's muted/unmuted
		try {
		mService.reportAudioStatus(getDeviceType(), volume, maxVolume, isMute);
		} catch (RemoteException e) {
		// do nothing. Reporting audio status is optional.
		}
		return;
		}

		mLastVolume = volume;
		mLastMaxVolume = maxVolume;
		mLastIsMute = isMute;
		if (mCanSendAudioStatus) {
		try {
		mService.reportAudioStatus(getDeviceType(), volume, maxVolume, isMute);
		mCanSendAudioStatus = false;
		mHandler.postDelayed(new Runnable() {
		@Override
		public void run() {
		if (mPendingReportAudioStatus) {
		// report audio status if there is any pending message
		try {
		mService.reportAudioStatus(getDeviceType(), mLastVolume,
		mLastMaxVolume, mLastIsMute);
		mHandler.postDelayed(this, REPORT_AUDIO_STATUS_INTERVAL_MS);
		} catch (RemoteException e) {
		mCanSendAudioStatus = true;
		} finally {
		mPendingReportAudioStatus = false;
		}
		} else {
		mCanSendAudioStatus = true;
		}
		}
		}, REPORT_AUDIO_STATUS_INTERVAL_MS);
		} catch (RemoteException e) {
		// do nothing. Reporting audio status is optional.
		}
		} else {
		// if audio status cannot be sent, send it latter
		mPendingReportAudioStatus = true;
		}
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,4 +72,5 @@ interface IHdmiControlService {
		void sendMhlVendorCommand(int portId, int offset, int length, in byte[] data);
		void addHdmiMhlVendorCommandListener(IHdmiMhlVendorCommandListener listener);
		void setStandbyMode(boolean isStandbyModeOn);
		void reportAudioStatus(int deviceType, int volume, int maxVolume, boolean isMute);
		}

core/tests/hdmitests/Android.mk

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2018 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.

		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_MODULE_TAGS := tests

		# Include all test java files
		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test frameworks-base-testutils

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_PACKAGE_NAME := HdmiCecTests
		LOCAL_PRIVATE_PLATFORM_APIS := true

		LOCAL_CERTIFICATE := platform

		include $(BUILD_PACKAGE)

core/tests/hdmitests/AndroidManifest.xml

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="android.hardware.hdmi"
		android:sharedUserId="android.uid.system" >

		<application>
		<uses-library android:name="android.test.runner" />
		</application>

		<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
		android:targetPackage="android.hardware.hdmi"
		android:label="HDMI CEC Tests"/>

		</manifest>
		No newline at end of file

core/tests/hdmitests/AndroidTest.xml

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<configuration description="Runs HDMI CEC Tests.">
		<option name="test-suite-tag" value="apct"/>
		<option name="test-suite-tag" value="apct-instrumentation"/>

		<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
		<option name="cleanup-apks" value="true" />
		<option name="test-file-name" value="HdmiCecTests.apk" />
		</target_preparer>

		<option name="test-suite-tag" value="apct"/>
		<option name="test-tag" value="HdmiTests"/>

		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
		<option name="package" value="android.hardware.hdmi" />
		<option name="hidden-api-checks" value="false"/>
		<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
		</test>
		</configuration>
		No newline at end of file