LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix type confusion in createRandomUnicastAddress

Browse Source 
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
This commit is contained in:
Aaron Huang
2021-07-20 17:41:11 +08:00
parent f9d8bb6b8e
commit 190f81d8d3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staticlibs/framework/com/android/net/module/util/MacAddressUtils.java
View File

@@ -41,7 +41,8 @@ public final class MacAddressUtils {
private static final long NIC_MASK = longAddrFromByteAddr( private static final long NIC_MASK = longAddrFromByteAddr(
MacAddress.fromString("0:0:0:ff:ff:ff").toByteArray()); MacAddress.fromString("0:0:0:ff:ff:ff").toByteArray());
// Matches WifiInfo.DEFAULT_MAC_ADDRESS // 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; private static final int ETHER_ADDR_LEN = 6;
/** /**

3
staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java
View File

@@ -33,7 +33,8 @@ import org.junit.runner.RunWith;
public final class MacAddressUtilsTest { public final class MacAddressUtilsTest {
// Matches WifiInfo.DEFAULT_MAC_ADDRESS // 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 @Test
public void testIsMulticastAddress() { public void testIsMulticastAddress() {