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

Chunk
Conflicting content 
    private static String LS = System.getProperty("line.separator");

    private static String[] sDnsPropNames;
<<<<<<< HEAD
    private Handler mTarget;
    private Context mContext;
    private boolean mPrivateDnsRouteSet = false;
    private int mDefaultGatewayAddr = 0;
    private boolean mDefaultRouteSet = false;
=======
    private Runnable mReleaseWakeLockCallback;
>>>>>>> 6c9a30045b1e6b9ef5d756e0a9657576c546c9bd

    /**
     * A structure for supplying information about a supplicant state
Solution content 
    private static String LS = System.getProperty("line.separator");

    private static String[] sDnsPropNames;
    private Handler mTarget;
    private Context mContext;
    private boolean mPrivateDnsRouteSet = false;
    private int mDefaultGatewayAddr = 0;
    private boolean mDefaultRouteSet = false;
    private Runnable mReleaseWakeLockCallback;

    /**
     * A structure for supplying information about a supplicant state
File
WifiStateTracker.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * Return the IP addresses of the DNS servers available for the WLAN
     * network interface.
     * @return a list of DNS addresses, with no holes.
     */
    public String[] getDnsPropNames() {
        return sDnsPropNames;
    }

    /**
=======
>>>>>>> 6c9a30045b1e6b9ef5d756e0a9657576c546c9bd
     * Return the name of our WLAN network interface.
     * @return the name of our interface.
     */
Solution content 
    }

    /**
     * Return the name of our WLAN network interface.
     * @return the name of our interface.
     */
File
WifiStateTracker.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration