Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98ac6c79 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp 

Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
parents 643be3ba cb7cdd50

tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ import java.util.Set; 
    }



    @LayoutlibDelegate

    /*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) {

    /*package*/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts) {

        opts.inBitmap = null;

        return null;

    }

tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ public final class Canvas_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void native_drawPath(long nativeCanvas, int path, long paint) {

    /*package*/ static void native_drawPath(long nativeCanvas, long path, long paint) {

        final Path_Delegate pathDelegate = Path_Delegate.getDelegate(path);

        if (pathDelegate == null) {

            return;

tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ public final class Matrix_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static boolean native_invert(long native_object, int inverse) {

    /*package*/ static boolean native_invert(long native_object, long inverse) {

        Matrix_Delegate d = sManager.getDelegate(native_object);

        if (d == null) {

            return false;