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

Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984 am: dadc2fe3bb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533

Change-Id: Ia7e17399aa5da6bbb84419ef2d840cf14ee70ea9
This commit is contained in:
Lorenzo Colitti
2021-04-12 16:15:17 +00:00
committed by Automerger Merge Worker
parent 89d260c039 dadc2fe3bb
commit ffc11490ca
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
View File

@@ -43,6 +43,7 @@ import android.util.Log;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.StateMachine; import com.android.internal.util.StateMachine;
@@ -402,13 +403,20 @@ public class UpstreamNetworkMonitor {
notifyTarget(EVENT_ON_CAPABILITIES, network); notifyTarget(EVENT_ON_CAPABILITIES, network);
} }
private void updateLinkProperties(Network network, LinkProperties newLp) { private @Nullable UpstreamNetworkState updateLinkProperties(@NonNull Network network,
LinkProperties newLp) {
final UpstreamNetworkState prev = mNetworkMap.get(network); final UpstreamNetworkState prev = mNetworkMap.get(network);
if (prev == null || newLp.equals(prev.linkProperties)) { if (prev == null || newLp.equals(prev.linkProperties)) {
// Ignore notifications about networks for which we have not yet // Ignore notifications about networks for which we have not yet
// received onAvailable() (should never happen) and any duplicate // received onAvailable() (should never happen) and any duplicate
// notifications (e.g. matching more than one of our callbacks). // notifications (e.g. matching more than one of our callbacks).
return; //
// Also, it can happen that onLinkPropertiesChanged is called after
// onLost removed the state from mNetworkMap. This appears to be due
// to a bug in disconnectAndDestroyNetwork, which calls
// nai.clatd.update() after the onLost callbacks.
// TODO: fix the bug and make this method void.
return null;
} }
if (VDBG) { if (VDBG) {
@@ -416,13 +424,17 @@ public class UpstreamNetworkMonitor {
network, newLp)); network, newLp));
} }
mNetworkMap.put(network, new UpstreamNetworkState( final UpstreamNetworkState ns = new UpstreamNetworkState(newLp, prev.networkCapabilities,
newLp, prev.networkCapabilities, network)); network);
mNetworkMap.put(network, ns);
return ns;
} }
private void handleLinkProp(Network network, LinkProperties newLp) { private void handleLinkProp(Network network, LinkProperties newLp) {
updateLinkProperties(network, newLp); final UpstreamNetworkState ns = updateLinkProperties(network, newLp);
notifyTarget(EVENT_ON_LINKPROPERTIES, network); if (ns != null) {
notifyTarget(EVENT_ON_LINKPROPERTIES, ns);
}
} }
private void handleLost(Network network) { private void handleLost(Network network) {

5
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -1184,6 +1184,11 @@ public class TetheringTest {
assertTrue(mUpstreamNetworkMonitor.getCurrentPreferredUpstream().linkProperties assertTrue(mUpstreamNetworkMonitor.getCurrentPreferredUpstream().linkProperties
.hasIPv4Address()); .hasIPv4Address());
// Check that the code does not crash if onLinkPropertiesChanged is received after onLost.
mobile.fakeDisconnect();
mobile.sendLinkProperties();
mLooper.dispatchAll();
} }
private void runNcmTethering() { private void runNcmTethering() {