Merge changes Icf3df3aa,I92adad60

* changes: Add sEnableJavaBpfMap value to the dump Move CookieTag map dump to BpfNetMaps
2022-10-17 04:23:36 +00:00
parent df46aeb098 316d057ded
commit 403d7d7589
4 changed files with 23 additions and 67 deletions
--- a/tests/unit/java/com/android/server/BpfNetMapsTest.java
+++ b/tests/unit/java/com/android/server/BpfNetMapsTest.java
@@ -1070,4 +1070,11 @@ public final class BpfNetMapsTest {
        doTestDumpOwnerMatchConfig(DOZABLE_MATCH | invalid_match,
                "DOZABLE_MATCH UNKNOWN_MATCH(" + invalid_match + ")");
    }
+
+    @Test
+    @IgnoreUpTo(Build.VERSION_CODES.S_V2)
+    public void testDumpCookieTagMap() throws Exception {
+        mCookieTagMap.updateEntry(new CookieTagMapKey(123), new CookieTagMapValue(456, 0x789));
+        assertDumpContains(getDump(), "cookie=123 tag=0x789 uid=456");
+    }
 }