Merge changes from topic "cherrypicker-L48400000954920366:N08700001270826034" into tm-dev
* changes:
Disable NsdManager tests that need a new prebuilt
Ensure callbacks are run properly on executor
diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
index cc9c014..b1d44ea 100644
--- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
+++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
@@ -1149,7 +1149,7 @@
// already documented publicly, refer to {@link NetworkStatsManager#queryDetails}.
}
- @Test
+ @Test @Ignore // TODO(b/234099453): re-enable when the prebuilt module is updated
public void testUidStatsForTransport() throws Exception {
// pretend that network comes online
expectDefaultSettings();