| Chunk |
|---|
| Conflicting content |
|---|
loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,
R.bool.def_touch_exploration_enabled);
<<<<<<< HEAD
loadBooleanSetting(stmt, Settings.Secure.MESSAGING_APP_NOTIFICATIONS,
R.bool.def_messaging_app_notifications_on);
loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED,
R.bool.def_lockscreen_disabled);
loadBooleanSetting(stmt, Settings.Secure.DEVICE_PROVISIONED,
R.bool.def_device_provisioned);
=======
>>>>>>> faa81c82103e89a3f2c86c4e737d9beb7e557402
} finally {
if (stmt != null) stmt.close();
} |
| Solution content |
|---|
R.bool.def_touch_exploration_enabled);
loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,
loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED,
R.bool.def_lockscreen_disabled);
loadBooleanSetting(stmt, Settings.Secure.DEVICE_PROVISIONED,
R.bool.def_device_provisioned);
} finally {
if (stmt != null) stmt.close();
} |
| File |
|---|
| DatabaseHelper.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |