| Chunk |
|---|
| Conflicting content |
|---|
static final boolean PROFILE_ORIENTATION = false;
static final boolean DEBUG_STARTING_WINDOW = false;
static final boolean DEBUG_REORDER = false;
static final boolean SHOW_TRANSACTIONS = false;
<<<<<<< HEAD
static final boolean MEASURE_LATENCY = false;
static private LatencyTimer lt;
=======
>>>>>>> f31cbbf54ef8d44247c6f612429122a62335c11b
static final boolean BLUR = true; |
| Solution content |
|---|
static final boolean DEBUG_STARTING_WINDOW = false;
static final boolean DEBUG_REORDER = false;
static final boolean SHOW_TRANSACTIONS = false;
static final boolean MEASURE_LATENCY = false;
static private LatencyTimer lt;
static final boolean PROFILE_ORIENTATION = false;
static final boolean BLUR = true; |
| File |
|---|
| WindowManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
Object targetObj = mKeyWaiter.waitForNextEventTarget(null, qev,
ev, true, false);
<<<<<<< HEAD
if (MEASURE_LATENCY) {
lt.sample("3 Last dispatch finished ", System.nanoTime() - qev.whenNano);
}
=======
>>>>>>> f31cbbf54ef8d44247c6f612429122a62335c11b
int action = ev.getAction();
|
| Solution content |
|---|
Object targetObj = mKeyWaiter.waitForNextEventTarget(null, qev,
ev, true, false);
<<<<<<< HEAD:services/java/com/android/server/WindowManagerService.java
if (MEASURE_LATENCY) {
lt.sample("3 Last dispatch finished ", System.nanoTime() - qev.whenNano);
}
=======
>>>>>>> f31cbb:services/java/com/android/server/WindowManagerService.java
int action = ev.getAction();
|
| File |
|---|
| WindowManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
WindowState target = (WindowState)targetObj;
final long eventTime = ev.getEventTime();
<<<<<<< HEAD
final long eventTimeNano = ev.getEventTimeNano();
=======
>>>>>>> f31cbbf54ef8d44247c6f612429122a62335c11b
//Log.i(TAG, "Sending " + ev + " to " + target);
if (uid != 0 && uid != target.mSession.mUid) { |
| Solution content |
|---|
WindowState target = (WindowState)targetObj;
final long eventTime = ev.getEventTime();
<<<<<<< HEAD:services/java/com/android/server/WindowManagerService.java
final long eventTimeNano = ev.getEventTimeNano();
=======
>>>>>>> f31cbb:services/java/com/android/server/WindowManagerService.java
//Log.i(TAG, "Sending " + ev + " to " + target);
if (uid != 0 && uid != target.mSession.mUid) { |
| File |
|---|
| WindowManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return false;
}
}
<<<<<<< HEAD
if (MEASURE_LATENCY) {
lt.sample("4 in dispatchPointer ", System.nanoTime() - eventTimeNano);
}
if ((target.mAttrs.flags &
=======
if ((target.mAttrs.flags &
>>>>>>> f31cbbf54ef8d44247c6f612429122a62335c11b
WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES) != 0) {
//target wants to ignore fat touch events
boolean cheekPress = mPolicy.isCheekPressedAgainstScreen(ev); |
| Solution content |
|---|
return false;
}
}
<<<<<<< HEAD:services/java/com/android/server/WindowManagerService.java
if (MEASURE_LATENCY) {
lt.sample("4 in dispatchPointer ", System.nanoTime() - eventTimeNano);
}
if ((target.mAttrs.flags &
=======
if ((target.mAttrs.flags &
>>>>>>> f31cbb:services/java/com/android/server/WindowManagerService.java
WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES) != 0) {
//target wants to ignore fat touch events
boolean cheekPress = mPolicy.isCheekPressedAgainstScreen(ev); |
| File |
|---|
| WindowManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |