Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35cba128 authored by Cody Kesting's avatar Cody Kesting Committed by Gerrit Code Review
Browse files

Merge "Update ConnectivityDiagnosticsCallback function name."

parents e201a4bc 40f23ffb

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28706,7 +28706,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);















  }

























core/java/android/net/ConnectivityDiagnosticsManager.java



+5
−5




























Original line number
Diff line number
Diff line








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

































core/java/android/net/IConnectivityDiagnosticsCallback.aidl



+1
−1




























Original line number
Diff line number
Diff line








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
























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



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);















            }

































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



+3
−3




























Original line number
Diff line number
Diff line








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