| Chunk |
|---|
| Conflicting content |
|---|
}
private boolean _enable(boolean oldEnabledState, boolean savePref) {
<<<<<<< HEAD
boolean isSuccess = mDeviceHost.initialize();
=======
applyProperties();
boolean isSuccess = mManager.initialize();
>>>>>>> e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952
if (isSuccess) {
mIsNfcEnabled = true;
mIsDiscoveryOn = true; |
| Solution content |
|---|
}
private boolean _enable(boolean oldEnabledState, boolean savePref) {
boolean isSuccess = mDeviceHost.initialize();
if (isSuccess) {
mIsNfcEnabled = true;
mIsDiscoveryOn = true; |
| File |
|---|
| NfcService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
private boolean _disable(boolean oldEnabledState, boolean savePref) {
<<<<<<< HEAD
/* sometimes mDeviceHost.deinitialize() hangs, watch-dog it */
=======
/* sometimes mManager.deinitialize() hangs, watch-dog it */
>>>>>>> e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952
WatchDogThread watchDog = new WatchDogThread();
watchDog.start();
|
| Solution content |
|---|
}
private boolean _disable(boolean oldEnabledState, boolean savePref) {
/* sometimes mDeviceHost.deinitialize() hangs, watch-dog it */
WatchDogThread watchDog = new WatchDogThread();
watchDog.start();
|
| File |
|---|
| NfcService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |