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

Merge changes Ic2357dcf,Iddf8c71a am: 514e8ad39c

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

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9
This commit is contained in:
Lucas Lin
2021-03-25 12:07:49 +00:00
committed by Automerger Merge Worker
parent 849c987cf6 514e8ad39c
commit e7b2119b97
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/api/system-current.txt
View File

@@ -212,6 +212,7 @@ package android.net {
public abstract class NetworkAgent { 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, 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 @Nullable public android.net.Network getNetwork();
method public void markConnected(); method public void markConnected();
method public void onAddKeepalivePacketFilter(int, @NonNull android.net.KeepalivePacketData); method public void onAddKeepalivePacketFilter(int, @NonNull android.net.KeepalivePacketData);

1
framework/src/android/net/NetworkAgent.java
View File

@@ -391,7 +391,6 @@ public abstract class NetworkAgent {
* @param score the initial score of this network. Update with sendNetworkScore. * @param score the initial score of this network. Update with sendNetworkScore.
* @param config an immutable {@link NetworkAgentConfig} for this agent. * @param config an immutable {@link NetworkAgentConfig} for this agent.
* @param provider the {@link NetworkProvider} managing 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, public NetworkAgent(@NonNull Context context, @NonNull Looper looper, @NonNull String logTag,
@NonNull NetworkCapabilities nc, @NonNull LinkProperties lp, @NonNull NetworkCapabilities nc, @NonNull LinkProperties lp,