diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-10-28 07:00:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-28 07:00:31 +0000 |
| commit | 111cc9f511dc65006fc2972c9ecbf295619e09b9 (patch) | |
| tree | 368b3ffcc2dbb873e0acfbb9348cc288cc604404 /services | |
| parent | aab38b7ea0b1774d158789772d0f6b1b99c1d3c9 (diff) | |
| parent | f3cab63ef2248aebf2c931cd1e84d5739791fa50 (diff) | |
| download | frameworks_base-111cc9f511dc65006fc2972c9ecbf295619e09b9.zip frameworks_base-111cc9f511dc65006fc2972c9ecbf295619e09b9.tar.gz frameworks_base-111cc9f511dc65006fc2972c9ecbf295619e09b9.tar.bz2 | |
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Nat464Xlat.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java index c382be0..3b0d8c1 100644 --- a/services/core/java/com/android/server/connectivity/Nat464Xlat.java +++ b/services/core/java/com/android/server/connectivity/Nat464Xlat.java @@ -217,7 +217,7 @@ public class Nat464Xlat extends BaseNetworkObserver { NetworkUtils.resetConnections( CLAT_INTERFACE_NAME, NetworkUtils.RESET_IPV4_ADDRESSES); - mBaseLP.removeStackedLink(mLP); + mBaseLP.removeStackedLink(CLAT_INTERFACE_NAME); updateConnectivityService(); } Slog.i(TAG, "interface " + CLAT_INTERFACE_NAME + |