commit 5e7247d92236a4ef078a1469eff261e824e3edf5
author Maciej Żenczykowski <maze@google.com> Wed Sep 04 12:57:09 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Wed Sep 04 21:32:04 2024 +0000
tree 1e6f21575c33d654657f1ff10763e895c9a6a3f4
parent 8a7672822d7b560baffd5aef625fb7b4f4b60c38

DscpPolicyValue: just use '!= null' on original src/dst46 argument

See Lorenzo's comment on aosp/3243843 for why.

Test: TreeHugger, atest CtsNetTestCases:android.net.cts.DscpPolicyTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I43cab1ee009ec53174fb102ca60ee91b3049857c

service/src/com/android/server/connectivity/DscpPolicyValue.java

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);
     }