Merge "HDMICEC: Override hashCode in HdmiDeviceInfo" am: 1d59ab8486 am: 76f22955a6 (8bee663c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/hdmi/HdmiDeviceInfo.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -513,4 +513,19 @@ public class HdmiDeviceInfo implements Parcelable {
		&& mDeviceId == other.mDeviceId
		&& mAdopterId == other.mAdopterId;
		}

		@Override
		public int hashCode() {
		return java.util.Objects.hash(
		mHdmiDeviceType,
		mPhysicalAddress,
		mPortId,
		mLogicalAddress,
		mDeviceType,
		mVendorId,
		mDevicePowerStatus,
		mDisplayName,
		mDeviceId,
		mAdopterId);
		}
		}

core/tests/hdmitests/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ android_test {
		static_libs: [
		"androidx.test.rules",
		"frameworks-base-testutils",
		"guava-android-testlib",
		"truth-prebuilt",
		],
		libs: ["android.test.runner"],

core/tests/hdmitests/src/android/hardware/hdmi/HdmiDeviceInfoTest.java

0 → 100755

+75 −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;

		import androidx.test.filters.SmallTest;

		import com.google.common.testing.EqualsTester;

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

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

		@Test
		public void testEquals() {
		int logicalAddr = 0x00;
		int phyAddr = 0x1000;
		int portId = 1;
		int deviceType = 0;
		int vendorId = 0x123456;
		String displayName = "test device";
		int powerStatus = HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY;
		int deviceId = 3;
		int adopterId = 2;

		new EqualsTester()
		.addEqualityGroup(new HdmiDeviceInfo())
		.addEqualityGroup(
		new HdmiDeviceInfo(phyAddr, portId), new HdmiDeviceInfo(phyAddr, portId))
		.addEqualityGroup(
		new HdmiDeviceInfo(phyAddr, portId, adopterId, deviceId),
		new HdmiDeviceInfo(phyAddr, portId, adopterId, deviceId))
		.addEqualityGroup(
		new HdmiDeviceInfo(
		logicalAddr, phyAddr, portId, deviceType, vendorId, displayName),
		new HdmiDeviceInfo(
		logicalAddr, phyAddr, portId, deviceType, vendorId, displayName))
		.addEqualityGroup(
		new HdmiDeviceInfo(
		logicalAddr,
		phyAddr,
		portId,
		deviceType,
		vendorId,
		displayName,
		powerStatus),
		new HdmiDeviceInfo(
		logicalAddr,
		phyAddr,
		portId,
		deviceType,
		vendorId,
		displayName,
		powerStatus))
		.testEquals();
		}
		}