From 190f81d8d34e2d4e3d71e1780f8fcedd4da963cc Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Tue, 20 Jul 2021 17:41:11 +0800 Subject: [PATCH] Fix type confusion in createRandomUnicastAddress In createRandomUnicastAddress, it compare the mac with the DEFAULT_MAC_ADDRESS. However, the DEFAULT_MAC_ADDRESS is defined as a string, so the MacAddress equals check always return false. This patch corrects the wrong String definition to MacAddress. Bug: 182165856 Test: NetworkStaticLibTests Change-Id: Ia0905bfa7a4dd723f42903f77f9d925349ce193e --- .../framework/com/android/net/module/util/MacAddressUtils.java | 3 ++- .../tests/unit/src/android/net/util/MacAddressUtilsTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java b/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java index bc11fa2a7c..ab0040c01e 100644 --- a/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java +++ b/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java @@ -41,7 +41,8 @@ public final class MacAddressUtils { private static final long NIC_MASK = longAddrFromByteAddr( MacAddress.fromString("0:0:0:ff:ff:ff").toByteArray()); // Matches WifiInfo.DEFAULT_MAC_ADDRESS - private static final String DEFAULT_MAC_ADDRESS = "02:00:00:00:00:00"; + private static final MacAddress DEFAULT_MAC_ADDRESS = + MacAddress.fromString("02:00:00:00:00:00"); private static final int ETHER_ADDR_LEN = 6; /** diff --git a/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java b/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java index 66d89ffd1d..8988571d3e 100644 --- a/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java +++ b/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java @@ -33,7 +33,8 @@ import org.junit.runner.RunWith; public final class MacAddressUtilsTest { // Matches WifiInfo.DEFAULT_MAC_ADDRESS - private static final String DEFAULT_MAC_ADDRESS = "02:00:00:00:00:00"; + private static final MacAddress DEFAULT_MAC_ADDRESS = + MacAddress.fromString("02:00:00:00:00:00"); @Test public void testIsMulticastAddress() {