diff options
6 files changed, 14 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index c16ff135a60f..42fb34fce428 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29818,7 +29818,7 @@ package android.net { public abstract static class ConnectivityDiagnosticsManager.ConnectivityDiagnosticsCallback { ctor public ConnectivityDiagnosticsManager.ConnectivityDiagnosticsCallback(); - method public void onConnectivityReport(@NonNull android.net.ConnectivityDiagnosticsManager.ConnectivityReport); + method public void onConnectivityReportAvailable(@NonNull android.net.ConnectivityDiagnosticsManager.ConnectivityReport); method public void onDataStallSuspected(@NonNull android.net.ConnectivityDiagnosticsManager.DataStallReport); method public void onNetworkConnectivityReported(@NonNull android.net.Network, boolean); } diff --git a/core/java/android/net/ConnectivityDiagnosticsManager.java b/core/java/android/net/ConnectivityDiagnosticsManager.java index 1710ccb31973..fbfd73964a64 100644 --- a/core/java/android/net/ConnectivityDiagnosticsManager.java +++ b/core/java/android/net/ConnectivityDiagnosticsManager.java @@ -233,8 +233,8 @@ public class ConnectivityDiagnosticsManager { * Constructor for ConnectivityReport. * * <p>Apps should obtain instances through {@link - * ConnectivityDiagnosticsCallback#onConnectivityReport} instead of instantiating their own - * instances (unless for testing purposes). + * ConnectivityDiagnosticsCallback#onConnectivityReportAvailable} instead of instantiating + * their own instances (unless for testing purposes). * * @param network The Network for which this ConnectivityReport applies * @param reportTimestamp The timestamp for the report @@ -622,10 +622,10 @@ public class ConnectivityDiagnosticsManager { /** @hide */ @VisibleForTesting - public void onConnectivityReport(@NonNull ConnectivityReport report) { + public void onConnectivityReportAvailable(@NonNull ConnectivityReport report) { Binder.withCleanCallingIdentity(() -> { mExecutor.execute(() -> { - mCb.onConnectivityReport(report); + mCb.onConnectivityReportAvailable(report); }); }); } @@ -666,7 +666,7 @@ public class ConnectivityDiagnosticsManager { * * @param report The ConnectivityReport containing information about a connectivity check */ - public void onConnectivityReport(@NonNull ConnectivityReport report) {} + public void onConnectivityReportAvailable(@NonNull ConnectivityReport report) {} /** * Called when the platform suspects a data stall on some Network. diff --git a/core/java/android/net/IConnectivityDiagnosticsCallback.aidl b/core/java/android/net/IConnectivityDiagnosticsCallback.aidl index 3a161bfabfd2..82b64a928000 100644 --- a/core/java/android/net/IConnectivityDiagnosticsCallback.aidl +++ b/core/java/android/net/IConnectivityDiagnosticsCallback.aidl @@ -22,7 +22,7 @@ import android.net.Network; /** @hide */ oneway interface IConnectivityDiagnosticsCallback { - void onConnectivityReport(in ConnectivityDiagnosticsManager.ConnectivityReport report); + void onConnectivityReportAvailable(in ConnectivityDiagnosticsManager.ConnectivityReport report); void onDataStallSuspected(in ConnectivityDiagnosticsManager.DataStallReport report); void onNetworkConnectivityReported(in Network n, boolean hasConnectivity); }
\ No newline at end of file diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 3a3358c4c059..62ea86283518 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -7817,7 +7817,7 @@ public class ConnectivityService extends IConnectivityManager.Stub getMatchingPermissionedCallbacks(nai); for (final IConnectivityDiagnosticsCallback cb : results) { try { - cb.onConnectivityReport(report); + cb.onConnectivityReportAvailable(report); } catch (RemoteException ex) { loge("Error invoking onConnectivityReport", ex); } diff --git a/tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java b/tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java index 8eb5cfa48c1a..1d6c10766792 100644 --- a/tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java +++ b/tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java @@ -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 diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 671c56499ad1..de8bf3c560d0 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -6894,14 +6894,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 |