Merge "Address MacAddressUtils / NetworkFactory comments"
diff --git a/staticlibs/src_frameworkcommon/android/net/util/MacAddressUtils.java b/staticlibs/src_frameworkcommon/android/net/util/MacAddressUtils.java
index e71f8fb..3ad452b 100644
--- a/staticlibs/src_frameworkcommon/android/net/util/MacAddressUtils.java
+++ b/staticlibs/src_frameworkcommon/android/net/util/MacAddressUtils.java
@@ -103,7 +103,7 @@
}
long longAddr = 0;
for (byte b : addr) {
- final int uint8Byte = b & 255;
+ final int uint8Byte = b & 0xff;
longAddr = (longAddr << 8) + uint8Byte;
}
return longAddr;
diff --git a/staticlibs/src_servicescommon/android/net/NetworkFactory.java b/staticlibs/src_servicescommon/android/net/NetworkFactory.java
index 571f796..3758bb5 100644
--- a/staticlibs/src_servicescommon/android/net/NetworkFactory.java
+++ b/staticlibs/src_servicescommon/android/net/NetworkFactory.java
@@ -29,9 +29,8 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* A NetworkFactory is an entity that creates NetworkAgent objects.
@@ -49,20 +48,6 @@
* @hide
**/
public class NetworkFactory extends Handler {
- /* TODO: delete when all callers have migrated to NetworkProvider IDs. */
- public static class SerialNumber {
- // Guard used by no network factory.
- public static final int NONE = -1;
- // A hardcoded serial number for NetworkAgents representing VPNs. These agents are
- // not created by any factory, so they use this constant for clarity instead of NONE.
- public static final int VPN = -2;
- private static final AtomicInteger sNetworkFactorySerialNumber = new AtomicInteger(1);
- /** Returns a unique serial number for a factory. */
- public static final int nextSerialNumber() {
- return sNetworkFactorySerialNumber.getAndIncrement();
- }
- }
-
private static final boolean DBG = true;
private static final boolean VDBG = false;
/**
@@ -115,7 +100,7 @@
private final String LOG_TAG;
private final Map<NetworkRequest, NetworkRequestInfo> mNetworkRequests =
- new HashMap<>();
+ new LinkedHashMap<>();
private int mScore;
private NetworkCapabilities mCapabilityFilter;