LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update ConnectivityDiagnosticsCallback function name."

Browse Source
This commit is contained in:
Cody Kesting
2020-03-17 19:00:39 +00:00
committed by Gerrit Code Review
parent d498a01647 fa1ef5eb1b
commit 5596ba1619
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/ConnectivityDiagnosticsManager.java
View File

@@ -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.

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -7810,7 +7810,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);
}

6
tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java
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

5
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -6910,14 +6910,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