| Chunk |
|---|
| Conflicting content |
|---|
mHandler.removeCallbacks(mPowerLongPress);
if (mShouldTurnOffOnKeyUp) {
mShouldTurnOffOnKeyUp = false;
<<<<<<< HEAD
boolean gohome, sleeps;
if (code == KeyEvent.KEYCODE_ENDCALL) {
gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
} else {
gohome = false;
sleeps = true;
}
if (keyguardShowing
=======
boolean gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
boolean sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
if (keyguardActive
>>>>>>> b64c72dfb3e635093b00690454cb905ffff68ab9
|| (sleeps && !gohome)
|| (gohome && !goHome() && sleeps)) {
// they must already be on the keyguad or home screen, |
| Solution content |
|---|
mHandler.removeCallbacks(mPowerLongPress);
if (mShouldTurnOffOnKeyUp) {
mShouldTurnOffOnKeyUp = false;
boolean gohome, sleeps;
if (code == KeyEvent.KEYCODE_ENDCALL) {
gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
} else {
gohome = false;
sleeps = true;
}
if (keyguardActive
|| (sleeps && !gohome)
|| (gohome && !goHome() && sleeps)) {
// they must already be on the keyguad or home screen, |
| File |
|---|
| PhoneWindowManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Variable |