Projects >> android-frameworks-base-with-screenshot-tweaks >>bb09485bcb36a2d5cf4d7760bfd89807bb3be573

Chunk
Conflicting content 
import com.android.internal.app.IBatteryStats;
import com.android.internal.util.AsyncChannel;
<<<<<<< HEAD
import com.android.internal.util.Protocol;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
=======
import com.android.internal.util.HierarchicalState;
import com.android.internal.util.HierarchicalStateMachine;
import com.android.internal.util.Protocol;
>>>>>>> 09564fbb9fb6fd588659a3f9347a252db3f3666d

import java.net.InetAddress;
import java.util.ArrayList;
Solution content 
import com.android.internal.app.IBatteryStats;
import com.android.internal.util.AsyncChannel;
import com.android.internal.util.Protocol;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;

import java.net.InetAddress;
import java.util.ArrayList;
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    static final int CMD_START_DRIVER                     = BASE + 13;
    /* Start the driver */
    static final int CMD_STOP_DRIVER                      = BASE + 14;
<<<<<<< HEAD
    /* Indicates Static IP succeded */
    static final int CMD_STATIC_IP_SUCCESS                = BASE + 15;
    /* Indicates Static IP failed */
    static final int CMD_STATIC_IP_FAILURE                = BASE + 16;
=======
    /* Indicates DHCP succeded */
    static final int CMD_IP_CONFIG_SUCCESS                = BASE + 15;
    /* Indicates DHCP failed */
    static final int CMD_IP_CONFIG_FAILURE                = BASE + 16;
>>>>>>> 09564fbb9fb6fd588659a3f9347a252db3f3666d

    /* Start the soft access point */
    static final int CMD_START_AP                         = BASE + 21;
Solution content 
    static final int CMD_START_DRIVER                     = BASE + 13;
    /* Start the driver */
    static final int CMD_STOP_DRIVER                      = BASE + 14;
    /* Indicates Static IP succeded */
    static final int CMD_STATIC_IP_SUCCESS                = BASE + 15;
    /* Indicates Static IP failed */
    static final int CMD_STATIC_IP_FAILURE                = BASE + 16;
    /* Start the soft access point */
    static final int CMD_START_AP                         = BASE + 21;
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment