Projects >> frameworks_base_disabled >>dbc361df8bc942f42d87d51e6cf46cf4bdf4c0c5

Chunk
Conflicting content
    private native ArrayList nativeGetTouchHighlightRects(int nativeClass,
            int x, int y, int slop);

<<<<<<< HEAD
    private native void nativeAutoFillForm(int nativeClass, int queryId);
    private native void nativeScrollLayer(int nativeClass, int layer, Rect rect);
=======
    private native void nativeAutoFillForm(int queryId);
    private native void nativeScrollLayer(int layer, Rect rect);
>>>>>>> 0265a4a0e02db98b85bd7f9be8b866d3fb9889d2
}
Solution content
    private native ArrayList nativeGetTouchHighlightRects(int nativeClass,
            int x, int y, int slop);

    private native void nativeAutoFillForm(int nativeClass, int queryId);
    private native void nativeScrollLayer(int nativeClass, int layer, Rect rect);
}
File
WebViewCore.java
Developer's decision
Version 1
Kind of conflict
Method interface