| Chunk |
|---|
| Conflicting content |
|---|
scheduleAppGcsLocked();
}
}
<<<<<<< HEAD
} else if (DEBUG_PROCESSES) {
=======
} else if (app.pid != pid) {
// A new process has already been started.
Log.i(TAG, "Process " + app.processName + " (pid " + pid
+ ") has died and restarted (pid " + app.pid + ").");
EventLog.writeEvent(LOG_AM_PROCESS_DIED, pid, app.processName);
} else if (Config.LOGD) {
>>>>>>> 4dcd2ee8cacc9b4c396b8611189595fd9bb7bcad
Log.d(TAG, "Received spurious death notification for thread "
+ thread.asBinder());
} |
| Solution content |
|---|
scheduleAppGcsLocked();
}
}
} else if (app.pid != pid) {
// A new process has already been started.
Log.i(TAG, "Process " + app.processName + " (pid " + pid
+ ") has died and restarted (pid " + app.pid + ").");
EventLog.writeEvent(EventLogTags.AM_PROC_DIED, app.pid, app.processName);
} else if (DEBUG_PROCESSES) {
Log.d(TAG, "Received spurious death notification for thread "
+ thread.asBinder());
} |
| File |
|---|
| ActivityManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |