Merge "Ensure no thread leak after NetworkStatsServiceTest" into main

2023-11-15 07:45:34 +00:00
parent 2cfffe7bfb 17f589cf47
commit c7126bb997
2 changed files with 52 additions and 8 deletions
--- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
+++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
@@ -193,6 +193,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 * TODO: This test used to be really brittle because it used Easymock - it uses Mockito now, but
 * still uses the Easymock structure, which could be simplified.
 */
+@DevSdkIgnoreRunner.MonitorThreadLeak
@RunWith(DevSdkIgnoreRunner.class)
@SmallTest
 // NetworkStatsService is not updatable before T, so tests do not need to be backwards compatible