Projects >> platform_frameworks_base >>05d791c38bd4f7412df317ed393c36910a37ae87

Chunk
Conflicting content 
    /*package*/ static boolean nativeRecycle(int nativeBitmap) {
        sManager.removeJavaReferenceFor(nativeBitmap);
        return true;
<<<<<<< HEAD
    }

    @LayoutlibDelegate
    /*package*/ static void nativeReconfigure(int nativeBitmap, int width, int height,
            int config, int allocSize) {
        Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
                "Bitmap.reconfigure() is not supported", null /*data*/);
=======
>>>>>>> efa617f9fe4cbf5449d735118bf39fcfbc1dbf74
    }

    @LayoutlibDelegate
Solution content 
    /*package*/ static boolean nativeRecycle(int nativeBitmap) {
        sManager.removeJavaReferenceFor(nativeBitmap);
        return true;
    }

    @LayoutlibDelegate
    /*package*/ static void nativeReconfigure(int nativeBitmap, int width, int height,
            int config, int allocSize) {
        Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
                "Bitmap.reconfigure() is not supported", null /*data*/);
    }

    @LayoutlibDelegate
File
Bitmap_Delegate.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Method signature