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

Commit c4092235 authored by junyulai's avatar junyulai Committed by android-build-merger
Browse files

Merge "Move keepalive constants to their right place" am: 236b96f3 am: 292f73b0

am: b28aa263

Change-Id: I4dcbf65c8b778815eef748ee348c928a258d40e0
parents 0665f87c b28aa263
Loading
Loading
Loading
Loading
+15 −16
Original line number Diff line number Diff line
@@ -178,7 +178,21 @@ public abstract class NetworkAgent extends Handler {
     */
    public static final int EVENT_SOCKET_KEEPALIVE = BASE + 13;

    // TODO: move the above 2 constants down so they are in order once merge conflicts are resolved
    /**
     * Sent by ConnectivityService to inform this network transport of signal strength thresholds
     * that when crossed should trigger a system wakeup and a NetworkCapabilities update.
     *
     *   obj = int[] describing signal strength thresholds.
     */
    public static final int CMD_SET_SIGNAL_STRENGTH_THRESHOLDS = BASE + 14;

    /**
     * Sent by ConnectivityService to the NeworkAgent to inform the agent to avoid
     * automatically reconnecting to this network (e.g. via autojoin).  Happens
     * when user selects "No" option on the "Stay connected?" dialog box.
     */
    public static final int CMD_PREVENT_AUTOMATIC_RECONNECT = BASE + 15;

    /**
     * Sent by the KeepaliveTracker to NetworkAgent to add a packet filter.
     *
@@ -198,21 +212,6 @@ public abstract class NetworkAgent extends Handler {
     */
    public static final int CMD_REMOVE_KEEPALIVE_PACKET_FILTER = BASE + 17;

    /**
     * Sent by ConnectivityService to inform this network transport of signal strength thresholds
     * that when crossed should trigger a system wakeup and a NetworkCapabilities update.
     *
     *   obj = int[] describing signal strength thresholds.
     */
    public static final int CMD_SET_SIGNAL_STRENGTH_THRESHOLDS = BASE + 14;

    /**
     * Sent by ConnectivityService to the NeworkAgent to inform the agent to avoid
     * automatically reconnecting to this network (e.g. via autojoin).  Happens
     * when user selects "No" option on the "Stay connected?" dialog box.
     */
    public static final int CMD_PREVENT_AUTOMATIC_RECONNECT = BASE + 15;

    // TODO : remove these two constructors. They are a stopgap measure to help sheperding a number
    // of dependent changes that would conflict throughout the automerger graph. Having these
    // temporarily helps with the process of going through with all these dependent changes across