Projects >> frameworks_base_disabled >>e254afaa1f5639dab0ef1404d0a4cf2f0a63a1e3

Chunk
Conflicting content 
     */
    // Static for backward compatibility.
    public static boolean allowFileSchemeCookies() {
<<<<<<< HEAD
        return getInstance().allowFileSchemeCookiesImpl();
    }

    /**
     * Implements {@link #allowFileSchemeCookies()}
     * @hide Only for use by WebViewProvider implementations
     */
    protected boolean allowFileSchemeCookiesImpl() {
        throw new MustOverrideException();
=======
        // TODO: indirect this via the WebViewFactoryProvider.Statics interface. http://b/6379925
        return CookieManagerClassic.allowFileSchemeCookies();
>>>>>>> 2ad93e4549ba6bd1f821f9049cbd59269b5c2974
    }

    /**
Solution content 
     */
    // Static for backward compatibility.
    public static boolean allowFileSchemeCookies() {
        return getInstance().allowFileSchemeCookiesImpl();
    }

    /**
     * Implements {@link #allowFileSchemeCookies()}
     * @hide Only for use by WebViewProvider implementations
     */
    protected boolean allowFileSchemeCookiesImpl() {
        throw new MustOverrideException();
    }

    /**
File
CookieManager.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Return statement
Throw statement
Chunk
Conflicting content 
     */
    // Static for backward compatibility.
    public static void setAcceptFileSchemeCookies(boolean accept) {
<<<<<<< HEAD
        getInstance().setAcceptFileSchemeCookiesImpl(accept);
    }

    /**
     * Implements {@link #setAcceptFileSchemeCookies(boolean)}
     * @hide Only for use by WebViewProvider implementations
     */
    protected void setAcceptFileSchemeCookiesImpl(boolean accept) {
        throw new MustOverrideException();
=======
        // TODO: indirect this via the WebViewFactoryProvider.Statics interface. http://b/6379925
        CookieManagerClassic.setAcceptFileSchemeCookies(accept);
>>>>>>> 2ad93e4549ba6bd1f821f9049cbd59269b5c2974
    }
}
Solution content 
     */
    // Static for backward compatibility.
    public static void setAcceptFileSchemeCookies(boolean accept) {
        getInstance().setAcceptFileSchemeCookiesImpl(accept);
    }

    /**
     * Implements {@link #setAcceptFileSchemeCookies(boolean)}
     * @hide Only for use by WebViewProvider implementations
     */
    protected void setAcceptFileSchemeCookiesImpl(boolean accept) {
        throw new MustOverrideException();
    }
}
File
CookieManager.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Throw statement