Projects >> frameworks_base_disabled >>0631c608b0997efe5c0bd8e8955e65f1a7b3f32c

Chunk
Conflicting content 
                        modifiedBluetoothCoexistenceMode = true;

                        // Disable the coexistence mode
<<<<<<< HEAD
                        setBluetoothCoexistenceMode(
                                WifiNative.BLUETOOTH_COEXISTENCE_MODE_DISABLED);
=======
                        synchronized (WifiStateTracker.this) {
                            WifiNative.setBluetoothCoexistenceModeCommand(
                                    WifiNative.BLUETOOTH_COEXISTENCE_MODE_DISABLED);
                        }
                    }
                    
                    synchronized (WifiStateTracker.this) {
                        powerMode = WifiNative.getPowerModeCommand();
                        if (powerMode < 0) {
                            // Handle the case where supplicant driver does not support
                            // getPowerModeCommand.
                            powerMode = DRIVER_POWER_MODE_AUTO;
                        }
                        if (powerMode != DRIVER_POWER_MODE_ACTIVE) {
                            WifiNative.setPowerModeCommand(DRIVER_POWER_MODE_ACTIVE);
                        }
>>>>>>> fdedc522993ccbde6ba95b519ac81e32449959c8
                    }

                    setPowerMode(DRIVER_POWER_MODE_ACTIVE);
Solution content 
                        modifiedBluetoothCoexistenceMode = true;

                        // Disable the coexistence mode
                        setBluetoothCoexistenceMode(
                                WifiNative.BLUETOOTH_COEXISTENCE_MODE_DISABLED);
                    }
                    
                    powerMode = getPowerMode();
                    if (powerMode < 0) {
                      // Handle the case where supplicant driver does not support
                      // getPowerModeCommand.
                        powerMode = DRIVER_POWER_MODE_AUTO;
                    }
                    if (powerMode != DRIVER_POWER_MODE_ACTIVE) {
                        setPowerMode(DRIVER_POWER_MODE_ACTIVE);
                    }
File
WifiStateTracker.java
Developer's decision
Manual
Kind of conflict
Method invocation
Synchronized statement
Chunk
Conflicting content 
                        Log.i(TAG, "DhcpHandler: DHCP request failed: " +
                            NetworkUtils.getDhcpError());
                    }
<<<<<<< HEAD

                    setPowerMode(DRIVER_POWER_MODE_AUTO);

=======
                    synchronized (WifiStateTracker.this) {
                        if (powerMode != DRIVER_POWER_MODE_ACTIVE) {
                            WifiNative.setPowerModeCommand(powerMode);
                        }
                    }
                    
>>>>>>> fdedc522993ccbde6ba95b519ac81e32449959c8
                    if (modifiedBluetoothCoexistenceMode) {
                        // Set the coexistence mode back to its default value
                        setBluetoothCoexistenceMode(
Solution content 
                        Log.i(TAG, "DhcpHandler: DHCP request failed: " +
                            NetworkUtils.getDhcpError());
                    }

                    if (powerMode != DRIVER_POWER_MODE_ACTIVE) {
                        setPowerMode(powerMode);
                    }

                    if (modifiedBluetoothCoexistenceMode) {
                        // Set the coexistence mode back to its default value
                        setBluetoothCoexistenceMode(
File
WifiStateTracker.java
Developer's decision
Manual
Kind of conflict
Method invocation
Synchronized statement