Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 464xlat notification callback am: 8d6edc3270

Browse Source 
am: 24f7d5e655

* commit '24f7d5e65556dd661e52476586f684cc10f9fea2':
  Add 464xlat notification callback
This commit is contained in:
Erik Kline
2016-03-02 08:46:54 +00:00
committed by android-build-merger
parent 057f24547a 24f7d5e655
commit 57e047dcb0
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/net/java/android/net/ip/IpManager.java
View File

@@ -66,9 +66,6 @@ public class IpManager extends StateMachine {
private static final boolean DBG = true; private static final boolean DBG = true;
private static final boolean VDBG = false; private static final boolean VDBG = false;
private static final boolean NO_CALLBACKS = false;
private static final boolean SEND_CALLBACKS = true;
// For message logging. // For message logging.
private static final Class[] sMessageClasses = { IpManager.class, DhcpClient.class }; private static final Class[] sMessageClasses = { IpManager.class, DhcpClient.class };
private static final SparseArray<String> sWhatToString = private static final SparseArray<String> sWhatToString =
@@ -98,6 +95,10 @@ public class IpManager extends StateMachine {
public void onProvisioningSuccess(LinkProperties newLp) {} public void onProvisioningSuccess(LinkProperties newLp) {}
public void onProvisioningFailure(LinkProperties newLp) {} public void onProvisioningFailure(LinkProperties newLp) {}
// This is called whenever 464xlat is being enabled or disabled (i.e.
// started or stopped).
public void on464XlatChange(boolean enabled) {}
// Invoked on LinkProperties changes. // Invoked on LinkProperties changes.
public void onLinkPropertiesChange(LinkProperties newLp) {} public void onLinkPropertiesChange(LinkProperties newLp) {}
@@ -207,6 +208,13 @@ public class IpManager extends StateMachine {
private static final int MAX_LOG_RECORDS = 1000; private static final int MAX_LOG_RECORDS = 1000;
private static final boolean NO_CALLBACKS = false;
private static final boolean SEND_CALLBACKS = true;
// This must match the interface prefix in clatd.c.
// TODO: Revert this hack once IpManager and Nat464Xlat work in concert.
private static final String CLAT_PREFIX = "v4-";
private final Object mLock = new Object(); private final Object mLock = new Object();
private final State mStoppedState = new StoppedState(); private final State mStoppedState = new StoppedState();
private final State mStoppingState = new StoppingState(); private final State mStoppingState = new StoppingState();
@@ -215,6 +223,7 @@ public class IpManager extends StateMachine {
private final String mTag; private final String mTag;
private final Context mContext; private final Context mContext;
private final String mInterfaceName; private final String mInterfaceName;
private final String mClatInterfaceName;
@VisibleForTesting @VisibleForTesting
protected final Callback mCallback; protected final Callback mCallback;
private final INetworkManagementService mNwService; private final INetworkManagementService mNwService;
@@ -255,6 +264,7 @@ public class IpManager extends StateMachine {
mContext = context; mContext = context;
mInterfaceName = ifName; mInterfaceName = ifName;
mClatInterfaceName = CLAT_PREFIX + ifName;
mCallback = callback; mCallback = callback;
mNwService = nwService; mNwService = nwService;
@@ -265,7 +275,22 @@ public class IpManager extends StateMachine {
public void update() { public void update() {
sendMessage(EVENT_NETLINK_LINKPROPERTIES_CHANGED); sendMessage(EVENT_NETLINK_LINKPROPERTIES_CHANGED);
} }
}); }) {
@Override
public void interfaceAdded(String iface) {
if (mClatInterfaceName.equals(iface)) {
mCallback.on464XlatChange(true);
}
}
@Override
public void interfaceRemoved(String iface) {
if (mClatInterfaceName.equals(iface)) {
mCallback.on464XlatChange(false);
}
}
};
try { try {
mNwService.registerObserver(mNetlinkTracker); mNwService.registerObserver(mNetlinkTracker);
} catch (RemoteException e) { } catch (RemoteException e) {