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

Commit ef12df5d authored by Richard Uhler's avatar Richard Uhler Committed by android-build-merger
Browse files

Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev... 

Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev am: 8e96faae am: 7868592d
am: 495ae0f2

* commit '495ae0f2':
  Hold a ClassLoader reference in NativeAllocationRegistry.

Change-Id: Idf41db6bf7636e413dfb505f499c1a3d42988d3b
parents 75cc0bc3 495ae0f2

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);

    }



    /**