Merge "Add back compat config for NSD"
This commit is contained in:
@@ -159,7 +159,7 @@ public class NsdServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
|
||||
@DisableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
|
||||
public void testPreSClients() throws Exception {
|
||||
// Pre S client connected, the daemon should be started.
|
||||
connectClient(mService);
|
||||
@@ -186,7 +186,7 @@ public class NsdServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
|
||||
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
|
||||
public void testNoDaemonStartedWhenClientsConnect() throws Exception {
|
||||
// Creating an NsdManager will not cause daemon startup.
|
||||
connectClient(mService);
|
||||
@@ -220,7 +220,7 @@ public class NsdServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
|
||||
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
|
||||
public void testClientRequestsAreGCedAtDisconnection() throws Exception {
|
||||
final NsdManager client = connectClient(mService);
|
||||
final INsdManagerCallback cb1 = getCallback();
|
||||
@@ -263,7 +263,7 @@ public class NsdServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
|
||||
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
|
||||
public void testCleanupDelayNoRequestActive() throws Exception {
|
||||
final NsdManager client = connectClient(mService);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user