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

Commit f4301de6 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Clarify comments for Connectivity Diagnostics reports." am: b187c3c1 

Change-Id: If353d65d28842c6eb621a8881e9279a018fa9ffa
parents 39c41d34 b187c3c1

core/java/android/net/ConnectivityDiagnosticsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -659,8 +659,8 @@ public class ConnectivityDiagnosticsManager { 
    public abstract static class ConnectivityDiagnosticsCallback {

        /**

         * Called when the platform completes a data connectivity check. This will also be invoked

         * immediately upon registration with the latest report, if a report has already been

         * generated for this network.

         * immediately upon registration for each network matching the request with the latest

         * report, if a report has already been generated for that network.

         *

         * <p>The Network specified in the ConnectivityReport may not be active any more when this

         * method is invoked.

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -244,8 +244,9 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
    // How many of the satisfied requests are of type BACKGROUND_REQUEST.

    private int mNumBackgroundNetworkRequests = 0;



    // The last ConnectivityReport made available for this network.

    private ConnectivityReport mConnectivityReport;

    // The last ConnectivityReport made available for this network. This value is only null before a

    // report is generated. Once non-null, it will never be null again.

    @Nullable private ConnectivityReport mConnectivityReport;



    public final Messenger messenger;

    public final AsyncChannel asyncChannel;