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

Commit 54b100ce authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp 

* commit '98ac6c79':
  Fix a few more delegate methods in layoutlib.
parents cb6979ac 98ac6c79

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;

    }