Projects >> frameworks_base_disabled >>d75ee6f13aca098f5200e81cc339e7ca70dff01d

Chunk
Conflicting content 
            loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
                    R.bool.def_vibrate_in_silent);

<<<<<<< HEAD
            loadBooleanSetting(stmt, Settings.System.USE_PTP_INTERFACE,
                    R.bool.def_use_ptp_interface);

=======
>>>>>>> 7c93e52fac25fb76a67a82f1ccaa4ff6ad42e6ed
            // Set notification volume to follow ringer volume by default
            loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,
                    R.bool.def_notifications_use_ring_volume);
Solution content 
            loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
                    R.bool.def_vibrate_in_silent);

            loadBooleanSetting(stmt, Settings.System.USE_PTP_INTERFACE,
                    R.bool.def_use_ptp_interface);

            // Set notification volume to follow ringer volume by default
            loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,
                    R.bool.def_notifications_use_ring_volume);
File
DatabaseHelper.java
Developer's decision
Version 1
Kind of conflict
Method invocation