Projects >> packages_apps_Phone >>02139e8e22adbdd2f148243248d59bf492389c99

Chunk
Conflicting content 
                    || mInCallScreen.isOtaCallInEndState()
                    || ((cdmaOtaScreenState != null)
                    && (cdmaOtaScreenState.otaScreenState
<<<<<<< HEAD
                            != CdmaOtaScreenState.OtaScreenState.OTA_STATUS_UNDEFINED))) {
                // TODO: During OTA Call, display should not become dark to
                // allow user to see OTA UI update. Phone app needs to hold
                // a SCREEN_DIM_WAKE_LOCK wake lock during the entire OTA call.
=======
                            != CdmaOtaScreenState.OtaScreenState.OTA_STATUS_UNDEFINED)))) {
                // TODO(Moto): During OTA Call, display should not become dark to
                // allow user to see OTA UI update. Phone app needs to hold a SCREEN_DIM_WAKE_LOCK
                // wake lock during the entire OTA call.
>>>>>>> 065752d0b858268bd1fe3208f64129638fcdf411
                wakeUpScreen();
                // If InCallScreen is not in foreground we resume it to show the OTA call end screen
                // Fire off the InCallScreen intent
Solution content 
                    || mInCallScreen.isOtaCallInEndState()
                    || ((cdmaOtaScreenState != null)
                    && (cdmaOtaScreenState.otaScreenState
                            != CdmaOtaScreenState.OtaScreenState.OTA_STATUS_UNDEFINED)))) {
                // TODO: During OTA Call, display should not become dark to
                // allow user to see OTA UI update. Phone app needs to hold
                // a SCREEN_DIM_WAKE_LOCK wake lock during the entire OTA call.
                wakeUpScreen();
                // If InCallScreen is not in foreground we resume it to show the OTA call end screen
                // Fire off the InCallScreen intent
File
PhoneApp.java
Developer's decision
Combination
Kind of conflict
Comment
Chunk
Conflicting content 
            if (cdmaOtaInCallScreenUiState == null) {
                cdmaOtaInCallScreenUiState = new OtaUtils.CdmaOtaInCallScreenUiState();
            }
<<<<<<< HEAD
=======
        } else {
            //Clean up OTA data in GSM/UMTS. It is valid only for CDMA
            clearOtaState();
>>>>>>> 065752d0b858268bd1fe3208f64129638fcdf411
        }

        ringer.updateRingerContextAfterRadioTechnologyChange(this.phone);
Solution content 
            if (cdmaOtaInCallScreenUiState == null) {
                cdmaOtaInCallScreenUiState = new OtaUtils.CdmaOtaInCallScreenUiState();
            }
        } else {
            //Clean up OTA data in GSM/UMTS. It is valid only for CDMA
            clearOtaState();
        }

        ringer.updateRingerContextAfterRadioTechnologyChange(this.phone);
File
PhoneApp.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation