Projects >> packages_apps_phone >>20ebcffe86bfa9b5db1da8c47309f15ccc423a92

Chunk
Conflicting content
            phoneMgr = new PhoneInterfaceManager(this, phone);

<<<<<<< HEAD
            // Starts the SIP service. It's a no-op if SIP API is not supported
            // on the deivce.
            // TODO: Having the phone process host the SIP service is only
            // temporary. Will move it to a persistent communication process
            // later.
            SipService.start(this);
=======
            mHandler.sendEmptyMessage(EVENT_START_SIP_SERVICE);
>>>>>>> 0726dacfe51fdbaef53e01f25cb7ff5b60a24a8a

            int phoneType = phone.getPhoneType();
Solution content
            phoneMgr = new PhoneInterfaceManager(this, phone);

            mHandler.sendEmptyMessage(EVENT_START_SIP_SERVICE);

            int phoneType = phone.getPhoneType();
File
PhoneApp.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation