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

Commit 0d88194a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add documentation" into sc-dev am: d0966f81 

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

Change-Id: I44ff00dda73d8cea879506bd8b73fec3f739b49e
parents 40a26f28 d0966f81

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

+9 −1
Original line number Diff line number Diff line
@@ -167,7 +167,15 @@ public class NetworkProvider { 
        ConnectivityManager.from(mContext).declareNetworkRequestUnfulfillable(request);

    }



    /** @hide */

    /**

     * A callback for parties registering a NetworkOffer.

     *

     * This is used with {@link ConnectivityManager#offerNetwork}. When offering a network,

     * the system will use this callback to inform the caller that a network corresponding to

     * this offer is needed or unneeded.

     *

     * @hide

     */

    @SystemApi

    public interface NetworkOfferCallback {

        /**

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

+7 −0
Original line number Diff line number Diff line
@@ -48,7 +48,14 @@ public final class NetworkScore implements Parcelable { 
    })

    public @interface KeepConnectedReason { }



    /**

     * Do not keep this network connected if there is no outstanding request for it.

     */

    public static final int KEEP_CONNECTED_NONE = 0;

    /**

     * Keep this network connected even if there is no outstanding request for it, because it

     * is being considered for handover.

     */

    public static final int KEEP_CONNECTED_FOR_HANDOVER = 1;



    // Agent-managed policies