fix hardwarebuffer crash in low android version (#1630)

Co-authored-by: liamcli <[email protected]>
Tencent · Aug 1, 2023 · 56f7fb6 · 56f7fb6
1 parent f31758d
commit 56f7fb6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/android/libpag/src/main/java/org/libpag/BitmapHelper.java b/android/libpag/src/main/java/org/libpag/BitmapHelper.java
@@ -8,7 +8,7 @@
 
 class BitmapHelper {
 
-    static Pair<Bitmap, HardwareBuffer> CreateBitmap(int width, int height,
+    static Pair<Bitmap, Object> CreateBitmap(int width, int height,
                                                      boolean needGetHardwareBufferFromNative) {
         if (width == 0 || height == 0) {
             return Pair.create(null, null);

diff --git a/android/libpag/src/main/java/org/libpag/PAGDecoder.java b/android/libpag/src/main/java/org/libpag/PAGDecoder.java
@@ -116,16 +116,14 @@ private PAGDecoder(long nativeContext) {
      * forward order for better performance.
      */
     public Bitmap frameAtIndex(int index) {
-        Pair<Bitmap, HardwareBuffer> pair = BitmapHelper.CreateBitmap(width(), height(), false);
+        Pair<Bitmap, Object> pair = BitmapHelper.CreateBitmap(width(), height(), false);
         if (pair.first == null) {
             return null;
         }
         boolean success;
-        if (pair.second != null) {
-            success = readFrame(index, pair.second);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                pair.second.close();
-            }
+        if (pair.second != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            success = readFrame(index, (HardwareBuffer) pair.second);
+            ((HardwareBuffer) pair.second).close();
         } else {
             success = copyFrameTo(pair.first, index);
         }

diff --git a/android/libpag/src/main/java/org/libpag/PAGImageView.java b/android/libpag/src/main/java/org/libpag/PAGImageView.java
@@ -630,13 +630,15 @@ private boolean handleFrame(final int frame) {
         }
         synchronized (bitmapLock) {
             if (frontBitmap == null || _cacheAllFramesInMemory) {
-                Pair<Bitmap, HardwareBuffer> pair = BitmapHelper.CreateBitmap(decoderInfo._width,
+                Pair<Bitmap, Object> pair = BitmapHelper.CreateBitmap(decoderInfo._width,
                         decoderInfo._height, false);
                 if (pair.first == null) {
                     return false;
                 }
                 frontBitmap = pair.first;
-                frontHardwareBuffer = pair.second;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    frontHardwareBuffer = (HardwareBuffer) pair.second;
+                }
             }
             if (frontBitmap == null) {
                 return false;
@@ -645,11 +647,13 @@ private boolean handleFrame(final int frame) {
             Bitmap flushBitmap;
             if (!_cacheAllFramesInMemory) {
                 if (backBitmap == null) {
-                    Pair<Bitmap, HardwareBuffer> pair = BitmapHelper.CreateBitmap(decoderInfo._width, decoderInfo._height, false);
+                    Pair<Bitmap, Object> pair = BitmapHelper.CreateBitmap(decoderInfo._width, decoderInfo._height, false);
                     if (pair.first == null) {
                         return false;
                     }
-                    backHardwareBuffer = pair.second;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        backHardwareBuffer = (HardwareBuffer) pair.second;
+                    }
                     backBitmap = pair.first;
                 }
                 if (useFirst.get()) {

diff --git a/android/libpag/src/main/java/org/libpag/PAGSurface.java b/android/libpag/src/main/java/org/libpag/PAGSurface.java
@@ -173,12 +173,12 @@ private PAGSurface(long nativeSurface) {
      * PAGSurface will not be captured.
      */
     public Bitmap makeSnapshot() {
-        Pair<Bitmap, HardwareBuffer> pair = BitmapHelper.CreateBitmap(width(), height(), true);
+        Pair<Bitmap, Object> pair = BitmapHelper.CreateBitmap(width(), height(), true);
         if (pair.first == null) {
             return null;
         }
         if (pair.second != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            pair.second.close();
+            ((HardwareBuffer)pair.second).close();
         }
         return copyPixelsTo(pair.first) ? pair.first : null;
     }