Update ConnectivityDiagnosticsCallback function name.

API Council feedback suggests renaming ConnectivityDiagnosticsCallback
'onConnectivityReport' function to be 'onConnectivityReportAvailable'.

Bug: 150598997
Test: atest FrameworksNetTests
Change-Id: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
Merged-In: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
This commit is contained in:
Cody Kesting
2020-03-05 15:19:48 -08:00
parent 3fef3af249
commit fa1ef5eb1b
4 changed files with 12 additions and 11 deletions

View File

@@ -304,12 +304,12 @@ public class ConnectivityDiagnosticsManagerTest {
}
@Test
public void testConnectivityDiagnosticsCallbackOnConnectivityReport() {
mBinder.onConnectivityReport(createSampleConnectivityReport());
public void testConnectivityDiagnosticsCallbackOnConnectivityReportAvailable() {
mBinder.onConnectivityReportAvailable(createSampleConnectivityReport());
// The callback will be invoked synchronously by inline executor. Immediately check the
// latch without waiting.
verify(mCb).onConnectivityReport(eq(createSampleConnectivityReport()));
verify(mCb).onConnectivityReportAvailable(eq(createSampleConnectivityReport()));
}
@Test

View File

@@ -6878,14 +6878,15 @@ public class ConnectivityServiceTest {
}
@Test
public void testConnectivityDiagnosticsCallbackOnConnectivityReport() throws Exception {
public void testConnectivityDiagnosticsCallbackOnConnectivityReportAvailable()
throws Exception {
setUpConnectivityDiagnosticsCallback();
// Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onConnectivityReport fired
verify(mConnectivityDiagnosticsCallback).onConnectivityReport(
verify(mConnectivityDiagnosticsCallback).onConnectivityReportAvailable(
argThat(report -> {
final NetworkCapabilities nc = report.getNetworkCapabilities();
return nc.getUids() == null