| commit | 0a5550137cb03e0b2c681c2a081fd0c4a9999233 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Sep 04 23:10:27 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 04 23:10:27 2024 +0000 |
| tree | 3124c97e7ba915dd2be6c912d4c8fa404f92124a | |
| parent | 65db53714ca87184ee5617aad2af49aff38608ba [diff] | |
| parent | 5e7247d92236a4ef078a1469eff261e824e3edf5 [diff] |
DscpPolicyValue: just use '!= null' on original src/dst46 argument am: 5e7247d922 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3255777 Change-Id: Icf5fe1c023eb3840a83abafe01e3ba2557c017c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/connectivity/DscpPolicyValue.java b/service/src/com/android/server/connectivity/DscpPolicyValue.java index 7162a4a..a9100ac 100644 --- a/service/src/com/android/server/connectivity/DscpPolicyValue.java +++ b/service/src/com/android/server/connectivity/DscpPolicyValue.java
@@ -117,8 +117,8 @@ this.proto = proto != -1 ? proto : 0; this.dscp = dscp; - this.match_src_ip = (this.src46 != EMPTY_ADDRESS_FIELD); - this.match_dst_ip = (this.dst46 != EMPTY_ADDRESS_FIELD); + this.match_src_ip = (src46 != null); + this.match_dst_ip = (dst46 != null); this.match_src_port = (srcPort != -1); this.match_proto = (proto != -1); }