Merge changes Ibcebfcc2,Ic2e63185,I90def978,I30031fc9,I0cfa1989 (7e355f52) · Commits · e / os / android_frameworks_base

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

+32 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,10 @@ public final class HdmiControlManager {

		@Nullable private final IHdmiControlService mService;

		private static final int INVALID_PHYSICAL_ADDRESS = 0xFFFF;

		private int mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;

		/**
		* Broadcast Action: Display OSD message.
		* <p>Send when the service has a message to display on screen for events
		@@ -505,13 +509,40 @@ public final class HdmiControlManager {
		* @hide
		*/
		public int getPhysicalAddress() {
		if (mPhysicalAddress != INVALID_PHYSICAL_ADDRESS) {
		return mPhysicalAddress;
		}
		try {
		return mService.getPhysicalAddress();
		mPhysicalAddress = mService.getPhysicalAddress();
		return mPhysicalAddress;
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Check if the target device is connected to the current device. The
		* API also returns true if the current device is the target.
		*
		* @param targetDevice {@link HdmiDeviceInfo} of the target device.
		* @return true if {@code device} is directly or indirectly connected to the
		*
		* TODO(b/110094868): unhide for Q
		* @hide
		*/
		public boolean isTargetDeviceConnected(HdmiDeviceInfo targetDevice) {
		mPhysicalAddress = getPhysicalAddress();
		if (mPhysicalAddress == INVALID_PHYSICAL_ADDRESS) {
		return false;
		}
		int targetPhysicalAddress = targetDevice.getPhysicalAddress();
		if (targetPhysicalAddress == INVALID_PHYSICAL_ADDRESS) {
		return false;
		}
		return HdmiUtils.getLocalPortFromPhysicalAddress(targetPhysicalAddress, mPhysicalAddress)
		!= HdmiUtils.TARGET_NOT_UNDER_LOCAL_DEVICE;
		}

		/**
		* Listener used to get hotplug event from HDMI port.
		*/

core/java/android/hardware/hdmi/HdmiUtils.java

0 → 100644

+81 −0

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

		/**
		* Various utilities to handle HDMI CEC messages.
		*
		* TODO(b/110094868): unhide for Q
		* @hide
		*/
		public class HdmiUtils {

		/**
		* Return value of {@link #getLocalPortFromPhysicalAddress(int, int)}
		*/
		static final int TARGET_NOT_UNDER_LOCAL_DEVICE = -1;
		static final int TARGET_SAME_PHYSICAL_ADDRESS = 0;

		private HdmiUtils() { /* cannot be instantiated */ }

		/**
		* Method to parse target physical address to the port number on the current device.
		*
		* <p>This check assumes target address is valid.
		*
		* @param targetPhysicalAddress is the physical address of the target device
		* @param myPhysicalAddress is the physical address of the current device
		* @return
		* If the target device is under the current device, return the port number of current device
		* that the target device is connected to. This also applies to the devices that are indirectly
		* connected to the current device.
		*
		* <p>If the target device has the same physical address as the current device, return
		* {@link #TARGET_SAME_PHYSICAL_ADDRESS}.
		*
		* <p>If the target device is not under the current device, return
		* {@link #TARGET_NOT_UNDER_LOCAL_DEVICE}.
		*/
		public static int getLocalPortFromPhysicalAddress(
		int targetPhysicalAddress, int myPhysicalAddress) {
		if (myPhysicalAddress == targetPhysicalAddress) {
		return TARGET_SAME_PHYSICAL_ADDRESS;
		}

		int mask = 0xF000;
		int finalMask = 0xF000;
		int maskedAddress = myPhysicalAddress;

		while (maskedAddress != 0) {
		maskedAddress = myPhysicalAddress & mask;
		finalMask \|= mask;
		mask >>= 4;
		}

		int portAddress = targetPhysicalAddress & finalMask;
		if ((portAddress & (finalMask << 4)) != myPhysicalAddress) {
		return TARGET_NOT_UNDER_LOCAL_DEVICE;
		}

		mask <<= 4;
		int port = portAddress & mask;
		while ((port >> 4) != 0) {
		port >>= 4;
		}
		return port;
		}
		}

core/java/android/provider/Settings.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -7731,6 +7731,23 @@ public final class Settings {
		*/
		public static final String TV_INPUT_CUSTOM_LABELS = "tv_input_custom_labels";

		/**
		* Whether TV app uses non-system inputs.
		*
		* <p>
		* The value is boolean (1 or 0), where 1 means non-system TV inputs are allowed,
		* and 0 means non-system TV inputs are not allowed.
		*
		* <p>
		* Devices such as sound bars may have changed the system property allow_third_party_inputs
		* to false so the TV Application only uses HDMI and other built in inputs. This setting
		* allows user to override the default and have the TV Application use third party TV inputs
		* available on play store.
		*
		* @hide
		*/
		public static final String TV_APP_USES_NON_SYSTEM_INPUTS = "tv_app_uses_non_system_inputs";

		/**
		* Whether automatic routing of system audio to USB audio peripheral is disabled.
		* The value is boolean (1 or 0), where 1 means automatic routing is disabled,

core/tests/coretests/src/android/hardware/hdmi/HdmiUtilsTest.java

0 → 100644

+82 −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.
		*/
		package android.hardware.hdmi;

		import static com.google.common.truth.Truth.assertThat;

		import android.support.test.filters.SmallTest;

		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.junit.runners.JUnit4;

		@SmallTest
		@RunWith(JUnit4.class)
		/** Tests for {@link HdmiUtils} class. */
		public class HdmiUtilsTest {

		@Test
		public void pathToPort_isMe() {
		int targetPhysicalAddress = 0x1000;
		int myPhysicalAddress = 0x1000;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(
		HdmiUtils.TARGET_SAME_PHYSICAL_ADDRESS);
		}

		@Test
		public void pathToPort_isDirectlyBelow() {
		int targetPhysicalAddress = 0x1100;
		int myPhysicalAddress = 0x1000;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(1);
		}

		@Test
		public void pathToPort_isBelow() {
		int targetPhysicalAddress = 0x1110;
		int myPhysicalAddress = 0x1000;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(1);
		}

		@Test
		public void pathToPort_neitherMeNorBelow() {
		int targetPhysicalAddress = 0x3000;
		int myPhysicalAddress = 0x2000;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(
		HdmiUtils.TARGET_NOT_UNDER_LOCAL_DEVICE);

		targetPhysicalAddress = 0x2200;
		myPhysicalAddress = 0x3300;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(
		HdmiUtils.TARGET_NOT_UNDER_LOCAL_DEVICE);

		targetPhysicalAddress = 0x2213;
		myPhysicalAddress = 0x2212;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(
		HdmiUtils.TARGET_NOT_UNDER_LOCAL_DEVICE);

		targetPhysicalAddress = 0x2340;
		myPhysicalAddress = 0x2310;
		assertThat(HdmiUtils.getLocalPortFromPhysicalAddress(
		targetPhysicalAddress, myPhysicalAddress)).isEqualTo(
		HdmiUtils.TARGET_NOT_UNDER_LOCAL_DEVICE);
		}
		}

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -668,6 +668,7 @@ public class SettingsBackupTest {
		Settings.Secure.SMS_DEFAULT_APPLICATION,
		Settings.Secure.SPELL_CHECKER_ENABLED, // Intentionally removed in Q
		Settings.Secure.TRUST_AGENTS_INITIALIZED,
		Settings.Secure.TV_APP_USES_NON_SYSTEM_INPUTS,
		Settings.Secure.TV_INPUT_CUSTOM_LABELS,
		Settings.Secure.TV_INPUT_HIDDEN_INPUTS,
		Settings.Secure.TV_USER_SETUP_COMPLETE,