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

Commit 0ebdbb4a authored by Richard Uhler's avatar Richard Uhler
Browse files

Hold a ClassLoader reference in NativeAllocationRegistry. 

So that the native library isn't unloaded before we have a chance to
call the freeFunction.

Bug: 28406866
Change-Id: I889f1ccd91bba70e31fb8d09c0ec6d471fc35841
parent a2c10cae

graphics/java/android/graphics/Bitmap.java

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public final class Bitmap implements Parcelable { 
            nativeSize += getByteCount();

        }

        NativeAllocationRegistry registry = new NativeAllocationRegistry(

            nativeGetNativeFinalizer(), nativeSize);

            Bitmap.class.getClassLoader(), nativeGetNativeFinalizer(), nativeSize);

        registry.registerNativeAllocation(this, nativeBitmap);

    }

graphics/java/android/graphics/Canvas.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class Canvas { 
    // Use a Holder to allow static initialization of Canvas in the boot image.

    private static class NoImagePreloadHolder {

        public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry(

                getNativeFinalizer(), NATIVE_ALLOCATION_SIZE);

                Canvas.class.getClassLoader(), getNativeFinalizer(), NATIVE_ALLOCATION_SIZE);

    }



    // This field is used to finalize the native Canvas properly

graphics/java/android/graphics/Paint.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class Paint { 
    // Use a Holder to allow static initialization of Paint in the boot image.

    private static class NoImagePreloadHolder {

        public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry(

                nGetNativeFinalizer(), NATIVE_PAINT_SIZE);

                Paint.class.getClassLoader(), nGetNativeFinalizer(), NATIVE_PAINT_SIZE);

    }



    /**