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

Chunk
Conflicting content 
                    @Override
                    public void onReceive(Context context, Intent intent) {
                        mAirplaneModeOn.set(isAirplaneModeOn());
<<<<<<< HEAD
                        handleAirplaneModeToggled(mAirplaneModeOn.get());
=======
                        handleAirplaneModeToggled();
>>>>>>> 90503c116f87b985bb3baba1d35bd39e25d3dcaf
                        updateWifiState();
                    }
                },
Solution content 
                    @Override
                    public void onReceive(Context context, Intent intent) {
                        mAirplaneModeOn.set(isAirplaneModeOn());
                        handleAirplaneModeToggled(mAirplaneModeOn.get());
                        updateWifiState();
                    }
                },
File
WifiService.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private void handleWifiToggled(boolean wifiEnabled) {
        boolean airplaneEnabled = mAirplaneModeOn.get() && isAirplaneToggleable();
        if (wifiEnabled) {
            if (airplaneEnabled) {
=======
    private void handleWifiToggled(boolean enabled) {
        boolean airplane = mAirplaneModeOn.get() && isAirplaneToggleable();
        if (enabled) {
            if (airplane) {
>>>>>>> 90503c116f87b985bb3baba1d35bd39e25d3dcaf
                persistWifiState(WIFI_ENABLED_AIRPLANE_OVERRIDE);
            } else {
                persistWifiState(WIFI_ENABLED);
Solution content 
        }
    }

    private void handleWifiToggled(boolean wifiEnabled) {
        boolean airplaneEnabled = mAirplaneModeOn.get() && isAirplaneToggleable();
        if (wifiEnabled) {
            if (airplaneEnabled) {
                persistWifiState(WIFI_ENABLED_AIRPLANE_OVERRIDE);
            } else {
                persistWifiState(WIFI_ENABLED);
File
WifiService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private void handleAirplaneModeToggled(boolean airplaneEnabled) {
        if (airplaneEnabled) {
=======
    private void handleAirplaneModeToggled() {
        if (mAirplaneModeOn.get()) {
>>>>>>> 90503c116f87b985bb3baba1d35bd39e25d3dcaf
            // Wifi disabled due to airplane on
            if (mWifiEnabled) {
                persistWifiState(WIFI_DISABLED_AIRPLANE_ON);
Solution content 
        }
    }

    private void handleAirplaneModeToggled(boolean airplaneEnabled) {
        if (airplaneEnabled) {
            // Wifi disabled due to airplane on
            if (mWifiEnabled) {
                persistWifiState(WIFI_DISABLED_AIRPLANE_ON);
File
WifiService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method signature