| Chunk |
|---|
| Conflicting content |
|---|
// At this point, nothing else needs to be shown
if (DEBUG_VISBILITY) Slog.v(TAG, "Fullscreen: at " + r);
behindFullscreen = true;
<<<<<<< HEAD
} else if (task.mOnTopOfHome) {
// Work our way down from r to bottom of task and see if there are any
// visible activities below r.
int rIndex = task.mActivities.indexOf(r);
for ( --rIndex; rIndex >= 0; --rIndex) {
final ActivityRecord blocker = task.mActivities.get(rIndex);
if (!blocker.finishing) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Home visibility for " +
r + " blocked by " + blocker);
break;
}
}
if (rIndex < 0) {
// Got to task bottom without finding a visible activity, show home.
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
behindFullscreen = true;
}
=======
} else if (task.mActivities.indexOf(r) == 0 && task.mOnTopOfHome) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
behindFullscreen = true;
>>>>>>> c0f8f24019ea1d2bada4c3f89163068ebb37349b
}
} else {
if (DEBUG_VISBILITY) Slog.v( |
| Solution content |
|---|
// At this point, nothing else needs to be shown
if (DEBUG_VISBILITY) Slog.v(TAG, "Fullscreen: at " + r);
behindFullscreen = true;
} else if (task.mOnTopOfHome) {
// Work our way down from r to bottom of task and see if there are any
// visible activities below r.
int rIndex = task.mActivities.indexOf(r);
for ( --rIndex; rIndex >= 0; --rIndex) {
final ActivityRecord blocker = task.mActivities.get(rIndex);
if (!blocker.finishing) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Home visibility for " +
r + " blocked by " + blocker);
break;
}
}
if (rIndex < 0) {
// Got to task bottom without finding a visible activity, show home.
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
behindFullscreen = true;
}
}
} else {
if (DEBUG_VISBILITY) Slog.v( |
| File |
|---|
| ActivityStack.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| For statement |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
synchronized(mWindowMap) {
Task task = mTaskIdToTask.get(taskId);
if (task == null) {
<<<<<<< HEAD
// Normal behavior, addAppToken will be called next and task will be created.
=======
>>>>>>> c0f8f24019ea1d2bada4c3f89163068ebb37349b
return;
}
final TaskStack stack = task.mStack; |
| Solution content |
|---|
synchronized(mWindowMap) {
Task task = mTaskIdToTask.get(taskId);
if (task == null) {
// Normal behavior, addAppToken will be called next and task will be created.
return;
}
final TaskStack stack = task.mStack; |
| File |
|---|
| WindowManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |