Projects >> platform_frameworks_base >>dbecc24a4ed4e9c24fc03db19038ee45cf7a0b1d

Chunk
Conflicting content 
        public static final String UNLOCK_SOUND = "unlock_sound";

        /**
<<<<<<< HEAD
         * True if we should appear as a PTP device instead of MTP.
         * @hide
         */
        public static final String USE_PTP_INTERFACE = "use_ptp_interface";
=======
         * Receive incoming SIP calls?
         * 0 = no
         * 1 = yes
         * @hide
         */
        public static final String SIP_RECEIVE_CALLS = "sip_receive_calls";

        /**
         * Call Preference String.
         * "SIP_ALWAYS" : Always use SIP with network access
         * "SIP_ADDRESS_ONLY" : Only if destination is a SIP address
         * "SIP_ASK_ME_EACH_TIME" : Always ask me each time
         * @hide
         */
        public static final String SIP_CALL_OPTIONS = "sip_call_options";

        /**
         * One of the sip call options: Always use SIP with network access.
         * @hide
         */
        public static final String SIP_ALWAYS = "SIP_ALWAYS";

        /**
         * One of the sip call options: Only if destination is a SIP address.
         * @hide
         */
        public static final String SIP_ADDRESS_ONLY = "SIP_ADDRESS_ONLY";

        /**
         * One of the sip call options: Always ask me each time.
         * @hide
         */
        public static final String SIP_ASK_ME_EACH_TIME = "SIP_ASK_ME_EACH_TIME";
>>>>>>> a329aef43f1d059cb58d1987fd20b63b8b76c43d

        /**
         * Settings to backup. This is here so that it's in the same place as the settings
Solution content 
        public static final String UNLOCK_SOUND = "unlock_sound";

        /**
         * True if we should appear as a PTP device instead of MTP.
         * @hide
         */
        public static final String USE_PTP_INTERFACE = "use_ptp_interface";

        /**
         * Receive incoming SIP calls?
         * 0 = no
         * 1 = yes
         * @hide
         */
        public static final String SIP_RECEIVE_CALLS = "sip_receive_calls";

        /**
         * Call Preference String.
         * "SIP_ALWAYS" : Always use SIP with network access
         * "SIP_ADDRESS_ONLY" : Only if destination is a SIP address
         * "SIP_ASK_ME_EACH_TIME" : Always ask me each time
         * @hide
         */
        public static final String SIP_CALL_OPTIONS = "sip_call_options";

        /**
         * One of the sip call options: Always use SIP with network access.
         * @hide
         */
        public static final String SIP_ALWAYS = "SIP_ALWAYS";

        /**
         * One of the sip call options: Only if destination is a SIP address.
         * @hide
         */
        public static final String SIP_ADDRESS_ONLY = "SIP_ADDRESS_ONLY";

        /**
         * One of the sip call options: Always ask me each time.
         * @hide
         */
        public static final String SIP_ASK_ME_EACH_TIME = "SIP_ASK_ME_EACH_TIME";

        /**
         * Settings to backup. This is here so that it's in the same place as the settings
File
Settings.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
            LOCKSCREEN_SOUNDS_ENABLED,
            SHOW_WEB_SUGGESTIONS,
            NOTIFICATION_LIGHT_PULSE,
<<<<<<< HEAD
            USE_PTP_INTERFACE,
=======
            SIP_CALL_OPTIONS,
            SIP_RECEIVE_CALLS
>>>>>>> a329aef43f1d059cb58d1987fd20b63b8b76c43d
        };

        // Settings moved to Settings.Secure
Solution content 
            LOCKSCREEN_SOUNDS_ENABLED,
            SHOW_WEB_SUGGESTIONS,
            NOTIFICATION_LIGHT_PULSE,
            USE_PTP_INTERFACE,
            SIP_CALL_OPTIONS,
            SIP_RECEIVE_CALLS
        };

        // Settings moved to Settings.Secure
File
Settings.java
Developer's decision
Concatenation
Kind of conflict
Attribute