| commit | ab19181ccc3bcd8df70da92724520ec602c7a1e1 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed May 03 00:11:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 03 00:11:31 2023 +0000 |
| tree | a5b5bfc4e27efd93b41f23dfa430a9aacbd0df98 | |
| parent | dc3d075dadfecf920c18f82101ea4312564229d2 [diff] | |
| parent | 087577476b9f3da9317479503ef4785fcc3ce529 [diff] |
Merge "Add null check for tupleOrig in ConntrackMessage" am: 69b6ca4ff1 am: 087577476b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2574182 Change-Id: Ic60be4899587e3eccf084f46814a79cbabe01f2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java b/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java index b3fb3e4..81d4fbe 100644 --- a/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java +++ b/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java
@@ -106,6 +106,7 @@ ConntrackMessage.Tuple tuple = ctmsg.tupleOrig; if (nlmsghdr.nlmsg_type == (NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_CT_NEW) + && tuple != null && tuple.protoNum == IPPROTO_TCP && tuple.srcIp.equals(local.getAddress()) && tuple.dstIp.equals(remote.getAddress())