Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "HDMICEC: Override hashCode in HdmiDeviceInfo" am: 1d59ab8486

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460262

Change-Id: I0991129389ed17d8664aa98db0ca85c61af839ce
This commit is contained in:
Treehugger Robot
2020-12-02 01:11:56 +00:00
committed by Automerger Merge Worker
parent b3bd1acb09 1d59ab8486
commit 76f22955a6
3 changed files with 91 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/hardware/hdmi/HdmiDeviceInfo.java
View File

@@ -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);
}
}

1
core/tests/hdmitests/Android.bp
View File

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

75
core/tests/hdmitests/src/android/hardware/hdmi/HdmiDeviceInfoTest.java Executable file
View File

@@ -0,0 +1,75 @@
/*
* 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();
}
}