| commit | ee20b69ed2d042532a9e3c5f6bcc15c388b61867 | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Thu Sep 16 09:54:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 16 09:54:21 2021 +0000 |
| tree | 72be5ceed8397ab183fc7db33cd2274400f00b66 | |
| parent | 84d43946178acbbcd8c2897f599848136387d5f5 [diff] | |
| parent | fe1d4a5a406a888053d50639c2652c40cb390eb0 [diff] |
Fix type confusion in createRandomUnicastAddress am: 4d59f6cbe4 am: bcb16b5ea1 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1774705 Change-Id: Ifa87a4fba1af3500de27b88e1c9130a549f42703
diff --git a/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java b/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java index bc11fa2..ab0040c 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 @@ 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 66d89ff..8988571 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 @@ 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() {