Projects >> packages_apps_Settings >>36410f04781583f04605526e9ce4ae190c87cc1a

Chunk
Conflicting content 
    private static final int EVENT_UPDATE_STATS = 500;

<<<<<<< HEAD
    private static final int EVENT_UPDATE_CONNECTIVITY = 600;

=======
>>>>>>> d393e7cbab2fb1c94b6885ebd1452be333e7130f
    private ConnectivityManager mCM;
    private TelephonyManager mTelephonyManager;
    private WifiManager mWifiManager;
Solution content 
    private static final int EVENT_UPDATE_STATS = 500;

    private static final int EVENT_UPDATE_CONNECTIVITY = 600;

    private ConnectivityManager mCM;
    private TelephonyManager mTelephonyManager;
    private WifiManager mWifiManager;
File
Status.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        }
    };

<<<<<<< HEAD
    private IntentFilter mConnectivityIntentFilter;
    private final BroadcastReceiver mConnectivityReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            String action = intent.getAction();
            if (ArrayUtils.contains(CONNECTIVITY_INTENTS, action)) {
                mHandler.sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY);
            }
        }
    };

=======
>>>>>>> d393e7cbab2fb1c94b6885ebd1452be333e7130f
    private boolean hasBluetooth() {
        return BluetoothAdapter.getDefaultAdapter() != null;
    }
Solution content 
        }
    };

    private IntentFilter mConnectivityIntentFilter;
    private final BroadcastReceiver mConnectivityReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            String action = intent.getAction();
            if (ArrayUtils.contains(CONNECTIVITY_INTENTS, action)) {
                mHandler.sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY);
            }
        }
    };

    private boolean hasBluetooth() {
        return BluetoothAdapter.getDefaultAdapter() != null;
    }
File
Status.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            mWimaxMacAddress = null;
        }

<<<<<<< HEAD
        mConnectivityIntentFilter = new IntentFilter();
        for (String intent: CONNECTIVITY_INTENTS) {
             mConnectivityIntentFilter.addAction(intent);
        }

=======
>>>>>>> d393e7cbab2fb1c94b6885ebd1452be333e7130f
        updateConnectivity();

        String serial = Build.SERIAL;
Solution content 
            mWimaxMacAddress = null;
        }

        mConnectivityIntentFilter = new IntentFilter();
        for (String intent: CONNECTIVITY_INTENTS) {
             mConnectivityIntentFilter.addAction(intent);
        }

        updateConnectivity();

        String serial = Build.SERIAL;
File
Status.java
Developer's decision
Version 1
Kind of conflict
Attribute
For statement
Method invocation