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

graphics/java/android/graphics/Bitmap.java

@@ -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

@@ -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

@@ -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);
     }
 
     /**