Projects >> packages_apps_Browser >>0aa9c423efbe87efa6c8a916853625768f6b8256

Chunk
Conflicting content 
            if (!TextUtils.isEmpty(urlData.mUrl) &&
                    urlData.mUrl.startsWith("javascript:")) {
                // Always open javascript: URIs in new tabs
<<<<<<< HEAD
                mController.openTab(urlData);
=======
                mController.openTabAndShow(null, urlData, true, appId);
>>>>>>> 463d599b6bfd79b6addeee53dec1de52f1b54eb8
                return;
            }
            if ((Intent.ACTION_VIEW.equals(action)
Solution content 
            if (!TextUtils.isEmpty(urlData.mUrl) &&
                    urlData.mUrl.startsWith("javascript:")) {
                // Always open javascript: URIs in new tabs
                mController.openTab(urlData);
                return;
            }
            if ((Intent.ACTION_VIEW.equals(action)
File
IntentHandler.java
Developer's decision
Version 1
Kind of conflict
Method invocation