joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Address MacAddressUtils / NetworkFactory comments"

Browse source
This commit is contained in:
Remi NGUYEN VAN 2020-01-22 04:35:49 +00:00 • committed by Gerrit Code Review
commit 8c06cabb4f
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
staticlibs/src_frameworkcommon/android/net/util/MacAddressUtils.java
View file

@ -103,7 +103,7 @@ public final class MacAddressUtils {
}
long longAddr = 0;
for (byte b : addr) {
final int uint8Byte = b & 255;
final int uint8Byte = b & 0xff;
longAddr = (longAddr << 8) + uint8Byte;
}
return longAddr;

19
staticlibs/src_servicescommon/android/net/NetworkFactory.java
View file

@ -29,9 +29,8 @@ import com.android.internal.annotations.VisibleForTesting;
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 @@ import java.util.concurrent.atomic.AtomicInteger;
* @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 @@ public class NetworkFactory extends Handler {
private final String LOG_TAG;
private final Map<NetworkRequest, NetworkRequestInfo> mNetworkRequests =
new HashMap<>();
new LinkedHashMap<>();
private int mScore;
private NetworkCapabilities mCapabilityFilter;