Update ConnectivityDiagnosticsCallback function name. (40f23ffb) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28706,7 +28706,7 @@ package android.net {

	public abstract static class ConnectivityDiagnosticsManager.ConnectivityDiagnosticsCallback {		public abstract static class ConnectivityDiagnosticsManager.ConnectivityDiagnosticsCallback {
	ctor public 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 onDataStallSuspected(@NonNull android.net.ConnectivityDiagnosticsManager.DataStallReport);
	method public void onNetworkConnectivityReported(@NonNull android.net.Network, boolean);		method public void onNetworkConnectivityReported(@NonNull android.net.Network, boolean);
	}		}

core/java/android/net/ConnectivityDiagnosticsManager.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -233,8 +233,8 @@ public class ConnectivityDiagnosticsManager {
	* Constructor for ConnectivityReport.		* Constructor for ConnectivityReport.
	*		*
	* <p>Apps should obtain instances through {@link		* <p>Apps should obtain instances through {@link
	* ConnectivityDiagnosticsCallback#onConnectivityReport} instead of instantiating their own		* ConnectivityDiagnosticsCallback#onConnectivityReportAvailable} instead of instantiating
	* instances (unless for testing purposes).		* their own instances (unless for testing purposes).
	*		*
	* @param network The Network for which this ConnectivityReport applies		* @param network The Network for which this ConnectivityReport applies
	* @param reportTimestamp The timestamp for the report		* @param reportTimestamp The timestamp for the report
	@@ -622,10 +622,10 @@ public class ConnectivityDiagnosticsManager {

	/** @hide */		/** @hide */
	@VisibleForTesting		@VisibleForTesting
	public void onConnectivityReport(@NonNull ConnectivityReport report) {		public void onConnectivityReportAvailable(@NonNull ConnectivityReport report) {
	Binder.withCleanCallingIdentity(() -> {		Binder.withCleanCallingIdentity(() -> {
	mExecutor.execute(() -> {		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		* @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.		* Called when the platform suspects a data stall on some Network.

core/java/android/net/IConnectivityDiagnosticsCallback.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ import android.net.Network;

	/** @hide */		/** @hide */
	oneway interface IConnectivityDiagnosticsCallback {		oneway interface IConnectivityDiagnosticsCallback {
	void onConnectivityReport(in ConnectivityDiagnosticsManager.ConnectivityReport report);		void onConnectivityReportAvailable(in ConnectivityDiagnosticsManager.ConnectivityReport report);
	void onDataStallSuspected(in ConnectivityDiagnosticsManager.DataStallReport report);		void onDataStallSuspected(in ConnectivityDiagnosticsManager.DataStallReport report);
	void onNetworkConnectivityReported(in Network n, boolean hasConnectivity);		void onNetworkConnectivityReported(in Network n, boolean hasConnectivity);
	}		}
			No newline at end of file

services/core/java/com/android/server/ConnectivityService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7810,7 +7810,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
	getMatchingPermissionedCallbacks(nai);		getMatchingPermissionedCallbacks(nai);
	for (final IConnectivityDiagnosticsCallback cb : results) {		for (final IConnectivityDiagnosticsCallback cb : results) {
	try {		try {
	cb.onConnectivityReport(report);		cb.onConnectivityReportAvailable(report);
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	loge("Error invoking onConnectivityReport", ex);		loge("Error invoking onConnectivityReport", ex);
	}		}

tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -304,12 +304,12 @@ public class ConnectivityDiagnosticsManagerTest {
	}		}

	@Test		@Test
	public void testConnectivityDiagnosticsCallbackOnConnectivityReport() {		public void testConnectivityDiagnosticsCallbackOnConnectivityReportAvailable() {
	mBinder.onConnectivityReport(createSampleConnectivityReport());		mBinder.onConnectivityReportAvailable(createSampleConnectivityReport());

	// The callback will be invoked synchronously by inline executor. Immediately check the		// The callback will be invoked synchronously by inline executor. Immediately check the
	// latch without waiting.		// latch without waiting.
	verify(mCb).onConnectivityReport(eq(createSampleConnectivityReport()));		verify(mCb).onConnectivityReportAvailable(eq(createSampleConnectivityReport()));
	}		}

	@Test		@Test