commit c3a43b406326bc6d736ef710a136e5a74f143f0a
author Aaron Huang <huangaaron@google.com> Fri Apr 01 16:34:22 2022 +0800
committer Aaron Huang <huangaaron@google.com> Tue Apr 19 17:49:30 2022 +0800
tree 61142dc74dbacdb6759c314cc41ad8e5f69f21be
parent ac8935bee7769d4c4418cdd48d525ebdc6a2667a

Fix NullPointerException happens in dumpCheckin

Currently dumpCheckin passes a null object to create
the contructor of NetworkStatsCollection.Key but the
constructor requires non-null object. Thus, it caused
the NPE in dumpCheckin. To fix this exception, create
an NetworkIdentitySet() object instead of using an
null object.

Bug: 225131008
Bug: 226539404
Test: dumpsys netstats --checkin is fine
      FrameworksNetTests
Change-Id: I7f2dadf0647b3f42e0f667d96291d2ae37e23faf

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 545f7b9..5b926de 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -63,6 +63,7 @@
         "java/android/net/IpSecManagerTest.java",
         "java/android/net/IpSecTransformTest.java",
         "java/android/net/KeepalivePacketDataUtilTest.java",
+        "java/android/net/NetworkIdentitySetTest.kt",
         "java/android/net/NetworkIdentityTest.kt",
         "java/android/net/NetworkStats*.java",
         "java/android/net/NetworkTemplateTest.kt",