Projects >> android-frameworks-base-with-screenshot-tweaks >>e69f1f1a748da99c82bcb56f6c7107a5618ba906

Chunk
Conflicting content 
     * methods may be called on a WebView after destroy.
     */
    public void destroy() {
<<<<<<< HEAD
        clearHelpers();
=======
        clearTextEntry(false);
        if (mListBoxDialog != null) {
            mListBoxDialog.dismiss();
            mListBoxDialog = null;
        }
>>>>>>> e3cfd35bf4d430e56456818bf8c84ef4c2c0dfde
        if (mWebViewCore != null) {
            // Set the handlers to null before destroying WebViewCore so no
            // more messages will be posted.
Solution content 
     * methods may be called on a WebView after destroy.
     */
    public void destroy() {
        clearHelpers();
        if (mListBoxDialog != null) {
            mListBoxDialog.dismiss();
            mListBoxDialog = null;
        }
        if (mWebViewCore != null) {
            // Set the handlers to null before destroying WebViewCore so no
            // more messages will be posted.
File
WebView.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation