| commit | e2b5ba3c2e8e6eb7b0667a25d45543e45abd98a0 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Sep 04 23:19:14 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 04 23:19:14 2024 +0000 |
| tree | f228a3b965dc3d8346ac508bd32958ef693392ab | |
| parent | dfeecb10d6e0496b73408b84f65c3642d3c34845 [diff] | |
| parent | 0a5550137cb03e0b2c681c2a081fd0c4a9999233 [diff] |
DscpPolicyValue: just use '!= null' on original src/dst46 argument am: 5e7247d922 am: 0a5550137c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3255777 Change-Id: I8c38b94e0a3afb48cf392bc6fe93157cc4a67025 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); }