Merge "Revert "Track HardwareBuffer native allocations"" into main

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java
index 131100d7032c..ce0f9f598897 100644
--- a/core/java/android/hardware/HardwareBuffer.java
+++ b/core/java/android/hardware/HardwareBuffer.java
@@ -285,8 +285,9 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable {
     private HardwareBuffer(long nativeObject) {
         mNativeObject = nativeObject;
         long bufferSize = nEstimateSize(nativeObject);
-        NativeAllocationRegistry registry = NativeAllocationRegistry.createNonmalloced(
-                HardwareBuffer.class, nGetNativeFinalizer(), bufferSize);
+        ClassLoader loader = HardwareBuffer.class.getClassLoader();
+        NativeAllocationRegistry registry = new NativeAllocationRegistry(
+                loader, nGetNativeFinalizer(), bufferSize);
         mCleaner = registry.registerNativeAllocation(this, mNativeObject);
         mCloseGuard.open("HardwareBuffer.close");
     }