LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-11-18 00:25:49 +00:00
committed by Android (Google) Code Review
parent b8ede29bec 38804ae6a4
commit c52ae42e2f
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. // - Idle: start() not called. Everything is null.
// - Starting: start() called. Interfaces are non-null. isStarted() returns true. // - Starting: start() called. Interfaces are non-null. isStarted() returns true.
// mIsRunning is false. // mIsRunning is false.
// - Running: start() called, and interfaceAdded() told us that mIface is up. Clat IP address // - Running: start() called, and interfaceLinkStateChanged() told us that mIface is up.
// is non-null. mIsRunning is true. // mIsRunning is true.
// //
// Once mIface is non-null and isStarted() is true, methods called by ConnectivityService on // 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 // 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 @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(). // Called by the InterfaceObserver on its own thread, so can race with stop().
if (isStarted() && mIface.equals(iface)) { if (isStarted() && up && mIface.equals(iface)) {
Slog.i(TAG, "interface " + iface + " added, mIsRunning " + mIsRunning + "->true"); Slog.i(TAG, "interface " + iface + " is up, mIsRunning " + mIsRunning + "->true");
if (!mIsRunning) { if (!mIsRunning) {
LinkAddress clatAddress = getLinkAddress(iface); LinkAddress clatAddress = getLinkAddress(iface);