commit e5b150a3cd4c60e40ffba86022f44a93ce796b3a
author Martijn Coenen <maco@google.com> Tue Dec 21 11:27:16 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 21 11:27:16 2021 +0000
tree e3097353fa87c3c45222c2178eb60833a7a97c93
parent 95d180b5bf6f9ef7f89fd17dd190d0f396f17561
parent 6ebc8ba59511c77745adee5cbb0150f8dc63abd9

Merge "Revert "Added a new network capability MMTEL""

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 49037ee..3735ca4 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -25,7 +25,7 @@
         "ld-android",
         "libbase",
         "libbinder",
-        "libbpf",
+        "libbpf_bcc",
         "libbpf_android",
         "libc++",
         "libcgrouprc",

tests/unit/java/android/net/NetworkStatsCollectionTest.java

diff --git a/tests/unit/java/android/net/NetworkStatsCollectionTest.java b/tests/unit/java/android/net/NetworkStatsCollectionTest.java
index 0c4ffac..1c557d6 100644
--- a/tests/unit/java/android/net/NetworkStatsCollectionTest.java
+++ b/tests/unit/java/android/net/NetworkStatsCollectionTest.java
@@ -28,7 +28,7 @@
 import static android.text.format.DateUtils.HOUR_IN_MILLIS;
 import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
 
-import static com.android.internal.net.NetworkUtilsInternal.multiplySafeByRational;
+import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
 import static com.android.testutils.MiscAsserts.assertThrows;
 
 import static org.junit.Assert.assertArrayEquals;