Projects >> platform_frameworks_base >>e648c19bf33ce78b3f67b7ffd95c92fd6996c418

Chunk
Conflicting content
                                                    long nativePaint,
                                                    int[] offsetXY);

<<<<<<< HEAD
    private static native void nativePrepareToDraw(long nativeBitmap);
    private static native boolean nativeHasAlpha(long nativeBitmap);
    private static native void nativeSetHasAlpha(long nativeBitmap, boolean hasAlpha);
    private static native boolean nativeHasMipMap(long nativeBitmap);
    private static native void nativeSetHasMipMap(long nativeBitmap, boolean hasMipMap);
    private static native boolean nativeSameAs(long nativeBitmap0, long nativeBitmap1);

    /* package */ final long ni() {
=======
    private static native void nativePrepareToDraw(int nativeBitmap);
    private static native boolean nativeHasAlpha(int nativeBitmap);
    private static native void nativeSetAlphaAndPremultiplied(int nBitmap, boolean hasAlpha,
                                                              boolean isPremul);
    private static native boolean nativeHasMipMap(int nativeBitmap);
    private static native void nativeSetHasMipMap(int nBitmap, boolean hasMipMap);
    private static native boolean nativeSameAs(int nb0, int nb1);
    
    /* package */ final int ni() {
>>>>>>> 8d3281f5f7a880b996e50d291ebb7154a486eb6c
        return mNativeBitmap;
    }
}
Solution content
                                                    long nativePaint,
                                                    int[] offsetXY);

    private static native void nativePrepareToDraw(long nativeBitmap);
    private static native boolean nativeHasAlpha(long nativeBitmap);
    private static native void nativeSetAlphaAndPremultiplied(long nativeBitmap, boolean hasAlpha,
                                                              boolean isPremul);
    private static native boolean nativeHasMipMap(long nativeBitmap);
    private static native void nativeSetHasMipMap(long nativeBitmap, boolean hasMipMap);
    private static native boolean nativeSameAs(long nativeBitmap0, long nativeBitmap1);

    /* package */ final long ni() {
        return mNativeBitmap;
    }
}
File
Bitmap.java
Developer's decision
Manual
Kind of conflict
Method interface
Method signature