| Chunk |
|---|
| Conflicting content |
|---|
public void release() {
if (!mRefCounted || --mCount == 0) {
<<<<<<< HEAD
PowerManagerService.this.releaseWakeLockLocked(mToken, false);
=======
PowerManagerService.this.releaseWakeLockLocked(mToken, 0, false);
mHeld = false;
>>>>>>> efd91d7ce01c7bd538fb0ca66d9f5395352211f8
}
if (mCount < 0) {
throw new RuntimeException("WakeLock under-locked " + mTag); |
| Solution content |
|---|
public void release() {
if (!mRefCounted || --mCount == 0) {
PowerManagerService.this.releaseWakeLockLockedmToken, 0, false);
}
if (mCount < 0) {
throw new RuntimeException("WakeLock under-locked " + mTag); |
| File |
|---|
| PowerManagerService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |