| Chunk |
|---|
| Conflicting content |
|---|
setVisible(r, true);
}
if (r != starting) {
<<<<<<< HEAD
mStackSupervisor.startSpecificActivityLocked(
r, noStackActivityResumed, false);
noStackActivityResumed = false;
=======
mStackSupervisor.startSpecificActivityLocked(r, false, false);
if (activityNdx >= activities.size()) {
// Record may be removed if its process needs to restart.
activityNdx = activities.size() - 1;
}
>>>>>>> 8f2bc09f52db70a6f282f386be3eb19018ba826c
}
} else if (r.visible) { |
| Solution content |
|---|
setVisible(r, true);
}
if (r != starting) {
mStackSupervisor.startSpecificActivityLocked(
r, noStackActivityResumed, false);
noStackActivityResumed = false;
}
} else if (r.visible) { |
| File |
|---|
| ActivityStack.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |