Merge "Guard against failed bitmap conversions" into udc-dev

2023-06-01 09:18:40 +00:00
parent 80ed45a7a0 80afa2317b
commit 4c45ee8c1d
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/SnapshotPersistQueue.java
+++ b/services/core/java/com/android/server/wm/SnapshotPersistQueue.java
@@ -314,6 +314,11 @@ class SnapshotPersistQueue {
            }

            final Bitmap swBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false /* isMutable */);
+            if (swBitmap == null) {
+                Slog.e(TAG, "Bitmap conversion from (config=" + bitmap.getConfig() + ", isMutable="
+                        + bitmap.isMutable() + ") to (config=ARGB_8888, isMutable=false) failed.");
+                return false;
+            }

            final File file = mPersistInfoProvider.getHighResolutionBitmapFile(mId, mUserId);
            try {