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

Commit c9dddc84 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f am: e3d28b9a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281
parents e2dfce5a e3d28b9a

packages/Connectivity/framework/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ package android.net { 


  public abstract class NetworkAgent {

    ctor public NetworkAgent(@NonNull android.content.Context, @NonNull android.os.Looper, @NonNull String, @NonNull android.net.NetworkCapabilities, @NonNull android.net.LinkProperties, int, @NonNull android.net.NetworkAgentConfig, @Nullable android.net.NetworkProvider);

    ctor public NetworkAgent(@NonNull android.content.Context, @NonNull android.os.Looper, @NonNull String, @NonNull android.net.NetworkCapabilities, @NonNull android.net.LinkProperties, @NonNull android.net.NetworkScore, @NonNull android.net.NetworkAgentConfig, @Nullable android.net.NetworkProvider);

    method @Nullable public android.net.Network getNetwork();

    method public void markConnected();

    method public void onAddKeepalivePacketFilter(int, @NonNull android.net.KeepalivePacketData);

packages/Connectivity/framework/src/android/net/NetworkAgent.java

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ public abstract class NetworkAgent { 
     * @param score the initial score of this network. Update with sendNetworkScore.

     * @param config an immutable {@link NetworkAgentConfig} for this agent.

     * @param provider the {@link NetworkProvider} managing this agent.

     * @hide TODO : unhide when impl is complete

     */

    public NetworkAgent(@NonNull Context context, @NonNull Looper looper, @NonNull String logTag,

            @NonNull NetworkCapabilities nc, @NonNull LinkProperties lp,