Projects >> platform_frameworks_base >>2b30afdbad5e79c5775ac9756f3b986268d90f1f

Chunk
Conflicting content 
            MAX_NETWORK_STATE_TRACKER_EVENT + 10;

    /**
<<<<<<< HEAD
     * used internally to restore DNS properties back to the
     * default network
     */
    private static final int EVENT_RESTORE_DNS =
=======
     * used internally to send a sticky broadcast delayed.
     */
    private static final int EVENT_SEND_STICKY_BROADCAST_INTENT =
>>>>>>> 7bb2d942498dea702f2020d7b81f0e13c2623500
            MAX_NETWORK_STATE_TRACKER_EVENT + 11;

    private Handler mHandler;
Solution content 
            MAX_NETWORK_STATE_TRACKER_EVENT + 10;

    /**
     * used internally to restore DNS properties back to the
     * default network
     */
    private static final int EVENT_RESTORE_DNS =
            MAX_NETWORK_STATE_TRACKER_EVENT + 11;

    /**
     * used internally to send a sticky broadcast delayed.
     */
    private static final int EVENT_SEND_STICKY_BROADCAST_INTENT =
            MAX_NETWORK_STATE_TRACKER_EVENT + 12;

    private Handler mHandler;
File
ConnectivityService.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
                    handleSetDependencyMet(msg.arg2, met);
                    break;
                }
<<<<<<< HEAD
                case EVENT_RESTORE_DNS:
                {
                    if (mActiveDefaultNetwork != -1) {
                        handleDnsConfigurationChange(mActiveDefaultNetwork);
                    }
=======
                case EVENT_SEND_STICKY_BROADCAST_INTENT:
                {
                    Intent intent = (Intent)msg.obj;
                    log("EVENT_SEND_STICKY_BROADCAST_INTENT: sendStickyBroadcast intent=" + intent);
                    sendStickyBroadcast(intent);
>>>>>>> 7bb2d942498dea702f2020d7b81f0e13c2623500
                    break;
                }
            }
Solution content 
                    handleSetDependencyMet(msg.arg2, met);
                    break;
                }
                case EVENT_RESTORE_DNS:
                {
                    if (mActiveDefaultNetwork != -1) {
                        handleDnsConfigurationChange(mActiveDefaultNetwork);
                    }
                    break;
                }
                case EVENT_SEND_STICKY_BROADCAST_INTENT:
                {
                    Intent intent = (Intent)msg.obj;
                    log("EVENT_SEND_STICKY_BROADCAST_INTENT: sendStickyBroadcast intent=" + intent);
                    sendStickyBroadcast(intent);
                    break;
                }
            }
File
ConnectivityService.java
Developer's decision
Concatenation
Kind of conflict
Case statement
Cast expression
If statement
Method invocation
Variable