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

am ff01f81f: am e9f7e65c: Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev

Browse Source 
* commit 'ff01f81f1e845fb1aa48405be3e89760bd7ac962':
  Populate 464xlat LinkProperties only when the interface comes up.
This commit is contained in:
Lorenzo Colitti
2014-11-18 02:08:22 +00:00
committed by Android Git Automerger
parent b9b2aa2f19 ff01f81f1e
commit fda8740722
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -63,8 +63,8 @@ public class Nat464Xlat extends BaseNetworkObserver {
// - Idle: start() not called. Everything is null.
// - Starting: start() called. Interfaces are non-null. isStarted() returns true.
// mIsRunning is false.
// - Running: start() called, and interfaceAdded() told us that mIface is up. Clat IP address
// is non-null. mIsRunning is true.
// - Running: start() called, and interfaceLinkStateChanged() told us that mIface is up.
// mIsRunning is true.
//
// Once mIface is non-null and isStarted() is true, methods called by ConnectivityService on
// its handler thread must not modify any internal state variables; they are only updated by the
@@ -236,10 +236,10 @@ public class Nat464Xlat extends BaseNetworkObserver {
}
@Override
public void interfaceAdded(String iface) {
public void interfaceLinkStateChanged(String iface, boolean up) {
// Called by the InterfaceObserver on its own thread, so can race with stop().
if (isStarted() && mIface.equals(iface)) {
Slog.i(TAG, "interface " + iface + " added, mIsRunning " + mIsRunning + "->true");
if (isStarted() && up && mIface.equals(iface)) {
Slog.i(TAG, "interface " + iface + " is up, mIsRunning " + mIsRunning + "->true");
if (!mIsRunning) {
LinkAddress clatAddress = getLinkAddress(iface);