Projects >> platform_packages_apps_Phone >>e2c6ada19038df827669be2ddaaf200a9dcb5bae

Chunk
Conflicting content 
        addPreferencesFromResource(R.xml.cdma_call_privacy);

        mButtonVoicePrivacy = (CheckBoxPreference) findPreference(BUTTON_VP_KEY);
<<<<<<< HEAD
        if (PhoneApp.getPhone().getPhoneType() != Phone.PHONE_TYPE_CDMA) {
=======
        if (PhoneFactory.getDefaultPhone().getPhoneType() != Phone.PHONE_TYPE_CDMA
                || getResources().getBoolean(R.bool.config_voice_privacy_disable)) {
>>>>>>> aa2433ef19e98079c4756fdc8d5ab49065050c5d
            //disable the entire screen
            getPreferenceScreen().setEnabled(false);
        }
Solution content 
        addPreferencesFromResource(R.xml.cdma_call_privacy);

        mButtonVoicePrivacy = (CheckBoxPreference) findPreference(BUTTON_VP_KEY);
        if (PhoneApp.getPhone().getPhoneType() != Phone.PHONE_TYPE_CDMA
                || getResources().getBoolean(R.bool.config_voice_privacy_disable)) {
            //disable the entire screen
            getPreferenceScreen().setEnabled(false);
        }
File
CdmaCallOptions.java
Developer's decision
Manual
Kind of conflict
If statement