Projects >> platform_frameworks_base >>1f2a307b59a6f1d61390425b52c3f0aafc21c54b

Chunk
Conflicting content 
    public boolean isValid() {
        if (mLocalMatrix != null && mLocalMatrix.getAffineTransform().getDeterminant() == 0) {
<<<<<<< HEAD
=======
            return false;
        }

        return true;
    }

    // ---- native methods ----

    @LayoutlibDelegate
    /*package*/ static void nativeDestructor(int native_shader) {
        sManager.removeJavaReferenceFor(native_shader);
    }

    @LayoutlibDelegate
    /*package*/ static boolean nativeGetLocalMatrix(int native_shader, int matrix_instance) {
        // get the delegate from the native int.
        Shader_Delegate shaderDelegate = sManager.getDelegate(native_shader);
        if (shaderDelegate == null) {
>>>>>>> 4754c79a77dc09259dee7e018710a96fe167bb8e
            return false;
        }
Solution content 
    public boolean isValid() {
        if (mLocalMatrix != null && mLocalMatrix.getAffineTransform().getDeterminant() == 0) {
            return false;
        }
File
Shader_Delegate.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
        if (configuredGraphics2D != null) {
            try {
                drawable.draw(configuredGraphics2D, paint);
<<<<<<< HEAD
                layer.change();
=======
>>>>>>> 4754c79a77dc09259dee7e018710a96fe167bb8e
            } finally {
                // dispose Graphics2D object
                configuredGraphics2D.dispose();
Solution content 
        if (configuredGraphics2D != null) {
            try {
                drawable.draw(configuredGraphics2D, paint);
                layer.change();
            } finally {
                // dispose Graphics2D object
                configuredGraphics2D.dispose();
File
GcSnapshot.java
Developer's decision
Version 1
Kind of conflict
Method invocation