Projects >> android-frameworks-base-with-screenshot-tweaks >>9f6a7f424fad614fdb991bd978009eb1321c70a6

Chunk
Conflicting content 
    // the set of network types that can only be enabled by system/sig apps
    List mProtectedNetworks;

<<<<<<< HEAD
    private DataConnectionStats mDataConnectionStats;
=======
    private AtomicInteger mEnableFailFastMobileDataTag = new AtomicInteger(0);

    TelephonyManager mTelephonyManager;
>>>>>>> 3b5d686e683b1811ca90e056065dcf3805bb256a

    public ConnectivityService(Context context, INetworkManagementService netd,
            INetworkStatsService statsService, INetworkPolicyManager policyManager) {
Solution content 
    // the set of network types that can only be enabled by system/sig apps
    List mProtectedNetworks;

    private DataConnectionStats mDataConnectionStats;
    private AtomicInteger mEnableFailFastMobileDataTag = new AtomicInteger(0);

    TelephonyManager mTelephonyManager;

    public ConnectivityService(Context context, INetworkManagementService netd,
            INetworkStatsService statsService, INetworkPolicyManager policyManager) {
File
ConnectivityService.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation