Projects >> android-frameworks-base-with-screenshot-tweaks >>942bc252ce7dbd229e28ee3a44dc94e1dd0b0d90

Chunk
Conflicting content 
        if (mFragmentBreadCrumbs == null) {
            View crumbs = findViewById(android.R.id.title);
            // For screens with a different kind of title, don't create breadcrumbs.
<<<<<<< HEAD
            try {
                mFragmentBreadCrumbs = (FragmentBreadCrumbs)crumbs;
            } catch (ClassCastException e) {
                return;
            }
=======
            if (crumbs != null && !(crumbs instanceof FragmentBreadCrumbs)) return;
            mFragmentBreadCrumbs = (FragmentBreadCrumbs) findViewById(android.R.id.title);
>>>>>>> fcdbcf9174f7a5404da4514b71041c3d37692d15
            if (mFragmentBreadCrumbs == null) {
                if (title != null) {
                    setTitle(title);
Solution content 
        if (mFragmentBreadCrumbs == null) {
            View crumbs = findViewById(android.R.id.title);
            // For screens with a different kind of title, don't create breadcrumbs.
            try {
                mFragmentBreadCrumbs = (FragmentBreadCrumbs)crumbs;
            } catch (ClassCastException e) {
                return;
            }
            if (mFragmentBreadCrumbs == null) {
                if (title != null) {
                    setTitle(title);
File
PreferenceActivity.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
If statement
Try statement