Projects information

Chunk

Conflicting content
* Sent by ConnectivityService to inform this network transport of signal strength thresholds public static final int CMD_REQUEST_BANDWIDTH_UPDATE = BASE + 10; /** <<<<<<< HEAD * Sent by ConnectivityService to the NetworkAgent to request that the specified packet be sent * periodically on the given interval. * * arg1 = the slot number of the keepalive to start * arg2 = interval in seconds * obj = KeepalivePacketData object describing the data to be sent * * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics. / public static final int CMD_START_PACKET_KEEPALIVE = BASE + 11; /* * Requests that the specified keepalive packet be stopped. * * arg1 = slot number of the keepalive to stop. * * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics. / public static final int CMD_STOP_PACKET_KEEPALIVE = BASE + 12; /* * Sent by the NetworkAgent to ConnectivityService to provide status on a packet keepalive * request. This may either be the reply to a CMD_START_PACKET_KEEPALIVE, or an asynchronous * error notification. * * This is also sent by KeepaliveTracker to the app's ConnectivityManager.PacketKeepalive to * so that the app's PacketKeepaliveCallback methods can be called. * * arg1 = slot number of the keepalive * arg2 = error code / public static final int EVENT_PACKET_KEEPALIVE = BASE + 13; /* * 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 + 11; >>>>>>> 308139425e697536304be55a5865aae7a290fb1d public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni, NetworkCapabilities nc, LinkProperties lp, int score) {

Conflicting content

     * Sent by ConnectivityService to inform this network transport of signal strength thresholds
    public static final int CMD_REQUEST_BANDWIDTH_UPDATE = BASE + 10;

    /**
<<<<<<< HEAD
     * Sent by ConnectivityService to the NetworkAgent to request that the specified packet be sent
     * periodically on the given interval.
     *
     *   arg1 = the slot number of the keepalive to start
     *   arg2 = interval in seconds
     *   obj = KeepalivePacketData object describing the data to be sent
     *
     * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics.
     */
    public static final int CMD_START_PACKET_KEEPALIVE = BASE + 11;

    /**
     * Requests that the specified keepalive packet be stopped.
     *
     * arg1 = slot number of the keepalive to stop.
     *
     * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics.
     */
    public static final int CMD_STOP_PACKET_KEEPALIVE = BASE + 12;

    /**
     * Sent by the NetworkAgent to ConnectivityService to provide status on a packet keepalive
     * request. This may either be the reply to a CMD_START_PACKET_KEEPALIVE, or an asynchronous
     * error notification.
     *
     * This is also sent by KeepaliveTracker to the app's ConnectivityManager.PacketKeepalive to
     * so that the app's PacketKeepaliveCallback methods can be called.
     *
     * arg1 = slot number of the keepalive
     * arg2 = error code
     */
    public static final int EVENT_PACKET_KEEPALIVE = BASE + 13;

    /**
     * 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 + 11;
>>>>>>> 308139425e697536304be55a5865aae7a290fb1d

    public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
            NetworkCapabilities nc, LinkProperties lp, int score) {

Solution content
public static final int CMD_REQUEST_BANDWIDTH_UPDATE = BASE + 10; /** * Sent by ConnectivityService to the NetworkAgent to request that the specified packet be sent * periodically on the given interval. * * arg1 = the slot number of the keepalive to start * arg2 = interval in seconds * obj = KeepalivePacketData object describing the data to be sent * * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics. / public static final int CMD_START_PACKET_KEEPALIVE = BASE + 11; /* * Requests that the specified keepalive packet be stopped. * * arg1 = slot number of the keepalive to stop. * * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics. / public static final int CMD_STOP_PACKET_KEEPALIVE = BASE + 12; /* * Sent by the NetworkAgent to ConnectivityService to provide status on a packet keepalive * request. This may either be the reply to a CMD_START_PACKET_KEEPALIVE, or an asynchronous * error notification. * * This is also sent by KeepaliveTracker to the app's ConnectivityManager.PacketKeepalive to * so that the app's PacketKeepaliveCallback methods can be called. * * arg1 = slot number of the keepalive * arg2 = error code / public static final int EVENT_PACKET_KEEPALIVE = BASE + 13; /* * 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; public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni, NetworkCapabilities nc, LinkProperties lp, int score) {

Solution content

    public static final int CMD_REQUEST_BANDWIDTH_UPDATE = BASE + 10;

    /**
     * Sent by ConnectivityService to the NetworkAgent to request that the specified packet be sent
     * periodically on the given interval.
     *
     *   arg1 = the slot number of the keepalive to start
     *   arg2 = interval in seconds
     *   obj = KeepalivePacketData object describing the data to be sent
     *
     * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics.
     */
    public static final int CMD_START_PACKET_KEEPALIVE = BASE + 11;

    /**
     * Requests that the specified keepalive packet be stopped.
     *
     * arg1 = slot number of the keepalive to stop.
     *
     * Also used internally by ConnectivityService / KeepaliveTracker, with different semantics.
     */
    public static final int CMD_STOP_PACKET_KEEPALIVE = BASE + 12;

    /**
     * Sent by the NetworkAgent to ConnectivityService to provide status on a packet keepalive
     * request. This may either be the reply to a CMD_START_PACKET_KEEPALIVE, or an asynchronous
     * error notification.
     *
     * This is also sent by KeepaliveTracker to the app's ConnectivityManager.PacketKeepalive to
     * so that the app's PacketKeepaliveCallback methods can be called.
     *
     * arg1 = slot number of the keepalive
     * arg2 = error code
     */
    public static final int EVENT_PACKET_KEEPALIVE = BASE + 13;

    /**
     * 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;

    public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,
            NetworkCapabilities nc, LinkProperties lp, int score) {

File
NetworkAgent.java

Developer's decision
Manual

Kind of conflict
Attribute
Comment

Chunk

Conflicting content
saveAcceptUnvalidated(msg.arg1 != 0); break; } <<<<<<< HEAD case CMD_START_PACKET_KEEPALIVE: { startPacketKeepalive(msg); break; } case CMD_STOP_PACKET_KEEPALIVE: { stopPacketKeepalive(msg); break; } case CMD_SET_SIGNAL_STRENGTH_THRESHOLDS: { ArrayList thresholds = ((Bundle) msg.obj).getIntegerArrayList("thresholds"); // TODO: Change signal strength thresholds API to use an ArrayList // rather than convert to int[]. int[] intThresholds = new int[(thresholds != null) ? thresholds.size() : 0]; for (int i = 0; i < intThresholds.length; i++) { intThresholds[i] = thresholds.get(i); } setSignalStrengthThresholds(intThresholds); ======= case CMD_PREVENT_AUTOMATIC_RECONNECT: { preventAutomaticReconnect(); >>>>>>> 308139425e697536304be55a5865aae7a290fb1d break; } }

Conflicting content

                saveAcceptUnvalidated(msg.arg1 != 0);
                break;
            }
<<<<<<< HEAD
            case CMD_START_PACKET_KEEPALIVE: {
                startPacketKeepalive(msg);
                break;
            }
            case CMD_STOP_PACKET_KEEPALIVE: {
                stopPacketKeepalive(msg);
                break;
            }

            case CMD_SET_SIGNAL_STRENGTH_THRESHOLDS: {
                ArrayList thresholds =
                        ((Bundle) msg.obj).getIntegerArrayList("thresholds");
                // TODO: Change signal strength thresholds API to use an ArrayList
                // rather than convert to int[].
                int[] intThresholds = new int[(thresholds != null) ? thresholds.size() : 0];
                for (int i = 0; i < intThresholds.length; i++) {
                    intThresholds[i] = thresholds.get(i);
                }
                setSignalStrengthThresholds(intThresholds);
=======
            case CMD_PREVENT_AUTOMATIC_RECONNECT: {
                preventAutomaticReconnect();
>>>>>>> 308139425e697536304be55a5865aae7a290fb1d
                break;
            }
        }

Solution content
saveAcceptUnvalidated(msg.arg1 != 0); break; } case CMD_START_PACKET_KEEPALIVE: { startPacketKeepalive(msg); break; } case CMD_STOP_PACKET_KEEPALIVE: { stopPacketKeepalive(msg); break; } case CMD_SET_SIGNAL_STRENGTH_THRESHOLDS: { ArrayList thresholds = ((Bundle) msg.obj).getIntegerArrayList("thresholds"); // TODO: Change signal strength thresholds API to use an ArrayList // rather than convert to int[]. int[] intThresholds = new int[(thresholds != null) ? thresholds.size() : 0]; for (int i = 0; i < intThresholds.length; i++) { intThresholds[i] = thresholds.get(i); } setSignalStrengthThresholds(intThresholds); break; } case CMD_PREVENT_AUTOMATIC_RECONNECT: { preventAutomaticReconnect(); break; } }

Solution content

                saveAcceptUnvalidated(msg.arg1 != 0);
                break;
            }
            case CMD_START_PACKET_KEEPALIVE: {
                startPacketKeepalive(msg);
                break;
            }
            case CMD_STOP_PACKET_KEEPALIVE: {
                stopPacketKeepalive(msg);
                break;
            }

            case CMD_SET_SIGNAL_STRENGTH_THRESHOLDS: {
                ArrayList thresholds =
                        ((Bundle) msg.obj).getIntegerArrayList("thresholds");
                // TODO: Change signal strength thresholds API to use an ArrayList
                // rather than convert to int[].
                int[] intThresholds = new int[(thresholds != null) ? thresholds.size() : 0];
                for (int i = 0; i < intThresholds.length; i++) {
                    intThresholds[i] = thresholds.get(i);
                }
                setSignalStrengthThresholds(intThresholds);
                break;
            }
            case CMD_PREVENT_AUTOMATIC_RECONNECT: {
                preventAutomaticReconnect();
                break;
            }
        }

File
NetworkAgent.java

Developer's decision
Concatenation

Kind of conflict
Break statement
Case statement
Comment
For statement
Method invocation
Variable

Chunk

Conflicting content
} /** <<<<<<< HEAD * Requests that the network hardware send the specified packet at the specified interval. / protected void startPacketKeepalive(Message msg) { onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED); } /* * Requests that the network hardware send the specified packet at the specified interval. / protected void stopPacketKeepalive(Message msg) { onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED); } /* * Called by the network when a packet keepalive event occurs. / public void onPacketKeepaliveEvent(int slot, int reason) { queueOrSendMessage(EVENT_PACKET_KEEPALIVE, slot, reason); } /* * Called by ConnectivityService to inform this network transport of signal strength thresholds * that when crossed should trigger a system wakeup and a NetworkCapabilities update. / protected void setSignalStrengthThresholds(int[] thresholds) { ======= Called when the user asks to not stay connected to this network because it was found to not * provide Internet access. Usually followed by call to {@code unwanted}. The transport is * responsible for making sure the device does not automatically reconnect to the same network * after the {@code unwanted} call. */ protected void preventAutomaticReconnect() { >>>>>>> 308139425e697536304be55a5865aae7a290fb1d } protected void log(String s) {

Conflicting content

    }

    /**
<<<<<<< HEAD
     * Requests that the network hardware send the specified packet at the specified interval.
     */
    protected void startPacketKeepalive(Message msg) {
        onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
    }

    /**
     * Requests that the network hardware send the specified packet at the specified interval.
     */
    protected void stopPacketKeepalive(Message msg) {
        onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
    }

    /**
     * Called by the network when a packet keepalive event occurs.
     */
    public void onPacketKeepaliveEvent(int slot, int reason) {
        queueOrSendMessage(EVENT_PACKET_KEEPALIVE, slot, reason);
    }

    /**
     * Called by ConnectivityService to inform this network transport of signal strength thresholds
     * that when crossed should trigger a system wakeup and a NetworkCapabilities update.
     */
    protected void setSignalStrengthThresholds(int[] thresholds) {
=======
     * Called when the user asks to not stay connected to this network because it was found to not
     * provide Internet access.  Usually followed by call to {@code unwanted}.  The transport is
     * responsible for making sure the device does not automatically reconnect to the same network
     * after the {@code unwanted} call.
     */
    protected void preventAutomaticReconnect() {
>>>>>>> 308139425e697536304be55a5865aae7a290fb1d
    }

    protected void log(String s) {

Solution content
} /** * Requests that the network hardware send the specified packet at the specified interval. / protected void startPacketKeepalive(Message msg) { onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED); } /* * Requests that the network hardware send the specified packet at the specified interval. / protected void stopPacketKeepalive(Message msg) { onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED); } /* * Called by the network when a packet keepalive event occurs. / public void onPacketKeepaliveEvent(int slot, int reason) { queueOrSendMessage(EVENT_PACKET_KEEPALIVE, slot, reason); } /* * Called by ConnectivityService to inform this network transport of signal strength thresholds * that when crossed should trigger a system wakeup and a NetworkCapabilities update. / protected void setSignalStrengthThresholds(int[] thresholds) { } /* * Called when the user asks to not stay connected to this network because it was found to not * provide Internet access. Usually followed by call to {@code unwanted}. The transport is * responsible for making sure the device does not automatically reconnect to the same network * after the {@code unwanted} call. */ protected void preventAutomaticReconnect() { } protected void log(String s) {

Solution content

    }

    /**
     * Requests that the network hardware send the specified packet at the specified interval.
     */
    protected void startPacketKeepalive(Message msg) {
        onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
    }

    /**
     * Requests that the network hardware send the specified packet at the specified interval.
     */
    protected void stopPacketKeepalive(Message msg) {
        onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
    }

    /**
     * Called by the network when a packet keepalive event occurs.
     */
    public void onPacketKeepaliveEvent(int slot, int reason) {
        queueOrSendMessage(EVENT_PACKET_KEEPALIVE, slot, reason);
    }

    /**
     * Called by ConnectivityService to inform this network transport of signal strength thresholds
     * that when crossed should trigger a system wakeup and a NetworkCapabilities update.
     */
    protected void setSignalStrengthThresholds(int[] thresholds) {
    }

    /**
     * Called when the user asks to not stay connected to this network because it was found to not
     * provide Internet access.  Usually followed by call to {@code unwanted}.  The transport is
     * responsible for making sure the device does not automatically reconnect to the same network
     * after the {@code unwanted} call.
     */
    protected void preventAutomaticReconnect() {
    }

    protected void log(String s) {

File
NetworkAgent.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method declaration
Method signature

Projects >> platform_frameworks_base >>bf10991d76ce6674726a668939be300cae150130