Projects >> android-frameworks-base-with-remote-control-service >>e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96

Chunk
Conflicting content 
                            " teardown");
                    }
                    if (!teardown(otherNet)) {
<<<<<<< HEAD
                        loge("Network declined teardown request");
=======
                        Slog.e(TAG, "Network declined teardown request");
                        teardown(thisNet);
>>>>>>> ab2194aadeb35a1f2eae6c4d3abd476b33f167f4
                        return;
                    }
                }
Solution content 
                            " teardown");
                    }
                    if (!teardown(otherNet)) {
                        loge("Network declined teardown request");
                        teardown(thisNet);
                        return;
                    }
                }
File
ConnectivityService.java
Developer's decision
Combination
Kind of conflict
Method invocation