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

Merge "Stop clatd when starting the Nat464Xlat service."

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-05-16 23:52:52 +00:00
committed by Android (Google) Code Review
parent be2d0e890d c050e7b935
commit 0e4a21806a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,14 @@ public class Nat464Xlat extends BaseNetworkObserver {
mIsStarted = false;
mIsRunning = false;
mLP = new LinkProperties();
// If this is a runtime restart, it's possible that clatd is already
// running, but we don't know about it. If so, stop it.
try {
if (mNMService.isClatdStarted()) {
mNMService.stopClatd();
}
} catch(RemoteException e) {} // Well, we tried.
}
/**
@@ -198,13 +206,13 @@ public class Nat464Xlat extends BaseNetworkObserver {
NetworkUtils.resetConnections(
CLAT_INTERFACE_NAME,
NetworkUtils.RESET_IPV4_ADDRESSES);
mBaseLP.removeStackedLink(mLP);
updateConnectivityService();
}
Slog.i(TAG, "interface " + CLAT_INTERFACE_NAME +
" removed, mIsRunning = " + mIsRunning + " -> false");
mIsRunning = false;
mBaseLP.removeStackedLink(mLP);
mLP.clear();
updateConnectivityService();
Slog.i(TAG, "mLP = " + mLP);
}
}