commit f6f106653235f4c3e3dfdef737893e84ae7fa6e4
author Junyu Lai <junyulai@google.com> Mon Jul 26 09:16:59 2021 +0000
committer Junyu Lai <junyulai@google.com> Mon Jul 26 09:16:59 2021 +0000
tree e60de8dba6d79ead425a96c70125255d351c9b0a
parent 1bdf075964245f86f35d8a78bb12c8226de8806d

Add debug log for tracking NPE of mMobileIfaces

Test: TH
Bug: 192758557
Change-Id: Ib048c18b1c64627de5a9d2b04d10e084a014ff64

services/core/java/com/android/server/net/NetworkStatsService.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index f571b35..097b071 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -934,6 +934,11 @@
 
     @Override
     public String[] getMobileIfaces() {
+        // TODO (b/192758557): Remove debug log.
+        if (ArrayUtils.contains(mMobileIfaces, null)) {
+            throw new NullPointerException(
+                    "null element in mMobileIfaces: " + Arrays.toString(mMobileIfaces));
+        }
         return mMobileIfaces.clone();
     }
 
@@ -1383,6 +1388,11 @@
         }
 
         mMobileIfaces = mobileIfaces.toArray(new String[0]);
+        // TODO (b/192758557): Remove debug log.
+        if (ArrayUtils.contains(mMobileIfaces, null)) {
+            throw new NullPointerException(
+                    "null element in mMobileIfaces: " + Arrays.toString(mMobileIfaces));
+        }
     }
 
     private static int getSubIdForMobile(@NonNull NetworkStateSnapshot state) {