commit e43aa9c4b147dc3f459828fbd7bf9fa6ba3090a8
author android-build-team Robot <android-build-team-robot@google.com> Sun Apr 29 07:28:04 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Apr 29 07:28:04 2018 +0000
tree 5349b4fbe79f4bbfb9aee8a49b3d4fa72435e2ac
parent ad9082fc481b9fe7b30f2e01a43ce0598a03b8b0
parent 64848957ba49275896c80790ceeeb6219930f687

Snap for 4751833 from 64848957ba49275896c80790ceeeb6219930f687 to pi-release

Change-Id: Ic167b25d177db6ad0c9204f66ed148d33e99a74a

net/netd/testutils/VtsHalNetNetdTestUtils.cpp

diff --git a/net/netd/testutils/VtsHalNetNetdTestUtils.cpp b/net/netd/testutils/VtsHalNetNetdTestUtils.cpp
index da377c4..0d4189d 100644
--- a/net/netd/testutils/VtsHalNetNetdTestUtils.cpp
+++ b/net/netd/testutils/VtsHalNetNetdTestUtils.cpp
@@ -88,7 +88,8 @@
 
 int countRulesForFwmark(const uint32_t fwmark) {
     // Skip top nibble, which differs between rules.
-    std::string regex = StringPrintf("from all fwmark 0x[0-9a-f]+%x/.* lookup ", fwmark);
+    std::string regex =
+        StringPrintf("from all fwmark 0x(%x|[0-9a-f]+%04x)/.* lookup ", fwmark, fwmark);
     return countMatchingIpRules(regex);
 }