Projects >> platform_packages_apps_Phone >>1ca1b441b65d55659e2553540f9b75b9749d7fde

Chunk
Conflicting content 
        mName =  intent.getStringExtra(INTENT_EXTRA_NAME);
        mNumber =  intent.getStringExtra(INTENT_EXTRA_NUMBER);

<<<<<<< HEAD
        if (TextUtils.isEmpty(mName) && TextUtils.isEmpty(mNumber)) {
            mAddContact = true;
        }
=======
        mAddContact = TextUtils.isEmpty(mNumber);
>>>>>>> 6e2ee7ced39898bc0645c1e88240654f8c181d89
    }

    /**
Solution content 
        mName =  intent.getStringExtra(INTENT_EXTRA_NAME);
        mNumber =  intent.getStringExtra(INTENT_EXTRA_NUMBER);

        mAddContact = TextUtils.isEmpty(mNumber);
    }

    /**
File
EditFdnContactScreen.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation