Projects >> platform_frameworks_base >>b0f6766bcc43a8ab7fb2549cce9ab8bafdeb43dd

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);

=======
>>>>>>> 68153821481f748ecbd2493bfd417005686960e0
            // 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