| Chunk |
|---|
| Conflicting content |
|---|
private static final int INITIALIZATION_UNBIND_DELAY_MS = 5000;
<<<<<<< HEAD
private static final String SYNC_WAKE_LOCK_PREFIX = "SyncWakeLock";
private static final String HANDLE_SYNC_ALARM_WAKE_LOCK = "SyncManagerHandleSyncAlarmWakeLock";
=======
private static final String SYNC_WAKE_LOCK = "*sync*";
private static final String HANDLE_SYNC_ALARM_WAKE_LOCK = "SyncManagerHandleSyncAlarm";
>>>>>>> 53686433a9790bcfe7211a661b26783ee12bb436
private Context mContext;
|
| Solution content |
|---|
private static final int INITIALIZATION_UNBIND_DELAY_MS = 5000;
private static final String SYNC_WAKE_LOCK_PREFIX = "*sync*";
private static final String HANDLE_SYNC_ALARM_WAKE_LOCK = "SyncManagerHandleSyncAlarm";
private Context mContext;
|
| File |
|---|
| SyncManager.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
case WifiManager.WIFI_MODE_FULL:
++mFullLocksAcquired;
break;
<<<<<<< HEAD
=======
case WifiManager.WIFI_MODE_FULL_HIGH_PERF:
++mFullHighPerfLocksAcquired;
break;
>>>>>>> 53686433a9790bcfe7211a661b26783ee12bb436
case WifiManager.WIFI_MODE_SCAN_ONLY:
++mScanLocksAcquired;
break; |
| Solution content |
|---|
case WifiManager.WIFI_MODE_FULL:
++mFullLocksAcquired;
break;
case WifiManager.WIFI_MODE_SCAN_ONLY:
++mScanLocksAcquired;
break; |
| File |
|---|
| WifiService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Break statement |
| Case statement |
| Chunk |
|---|
| Conflicting content |
|---|
case WifiManager.WIFI_MODE_FULL:
++mFullLocksReleased;
break;
<<<<<<< HEAD
=======
case WifiManager.WIFI_MODE_FULL_HIGH_PERF:
++mFullHighPerfLocksReleased;
break;
>>>>>>> 53686433a9790bcfe7211a661b26783ee12bb436
case WifiManager.WIFI_MODE_SCAN_ONLY:
++mScanLocksReleased;
break; |
| Solution content |
|---|
case WifiManager.WIFI_MODE_FULL:
++mFullLocksReleased;
break;
case WifiManager.WIFI_MODE_SCAN_ONLY:
++mScanLocksReleased;
break; |
| File |
|---|
| WifiService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Break statement |
| Case statement |