Projects >> platform_packages_apps_settings >>079e30cd2a09388ba9ad2149a66de86be4f3a7ac

Chunk
Conflicting content
        if (mPhone.getPhoneName().equals("CDMA")) {
        // Note - missing in zaku build, be careful later...
        mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
        mUptime = findPreference("up_time");
<<<<<<< HEAD
=======
        
        //NOTE "imei" is the "Device ID" since it represents the IMEI in GSM and the MEID in CDMA
            setSummaryText("meid_number", mPhone.getMeid());
            setSummaryText("min_number", mPhone.getCdmaMin());
            if (getResources().getBoolean(R.bool.config_msid_enable)) {
                findPreference("min_number").setTitle(R.string.status_msid_number);
            }
            setSummaryText("prl_version", mPhone.getCdmaPrlVersion());

            // device is not GSM/UMTS, do not display GSM/UMTS features
            // check Null in case no specified preference in overlay xml
            removablePref = findPreference("imei");
            if (removablePref != null) {
                getPreferenceScreen().removePreference(removablePref);
            }
            removablePref = findPreference("imei_sv");
            if (removablePref != null) {
                getPreferenceScreen().removePreference(removablePref);
            }
        } else {
            setSummaryText("imei", mPhone.getDeviceId());

            setSummaryText("imei_sv",
                    ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
                        .getDeviceSoftwareVersion());
>>>>>>> 531bed610c363bae71ff3d7b360f7c9ce612693e

        if (Utils.isWifiOnly()) {
            for (String key : PHONE_RELATED_ENTRIES) {
Solution content
        // Note - missing in zaku build, be careful later...
        mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
        mUptime = findPreference("up_time");

        if (Utils.isWifiOnly()) {
            for (String key : PHONE_RELATED_ENTRIES) {
File
Status.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable