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

Chunk
Conflicting content 
                    TetherStateChange stateChange = (TetherStateChange) message.obj;
                    if (!isWifiTethered(stateChange.active)) {
                        loge("Tethering reports wifi as untethered!, shut down soft Ap");
<<<<<<< HEAD
                        setHostApRunning(null, false);
=======
                        setWifiApEnabled(null, false);
                        setWifiApEnabled(null, true);
>>>>>>> ddf7a0660c456a975b12794c54fd6681e422ef29
                    }
                    return HANDLED;
                case CMD_STOP_AP:
Solution content 
                    TetherStateChange stateChange = (TetherStateChange) message.obj;
                    if (!isWifiTethered(stateChange.active)) {
                        loge("Tethering reports wifi as untethered!, shut down soft Ap");
                        setHostApRunning(null, false);
                    }
                    return HANDLED;
                case CMD_STOP_AP:
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Method invocation