diff options
| author | 2023-06-01 11:22:18 +0000 | |
|---|---|---|
| committer | 2023-06-01 11:22:18 +0000 | |
| commit | 38d7f4e431a9fcde616318c999920f64fe8d08ef (patch) | |
| tree | 6c3f7707961586424af5399ccddf40335f3cff3a | |
| parent | d7681f6d4b59bf26509d11328cfe36cbc3256975 (diff) | |
| parent | 65aa8b07c14b92c5c48f82e4433926f3c74926ea (diff) | |
Merge "Guard against failed bitmap conversions" into udc-dev am: 4c45ee8c1d am: 65aa8b07c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23493540
Change-Id: Ibba6c437ad52ba34704ecc4a2ae2e7a4ef60e1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/SnapshotPersistQueue.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/SnapshotPersistQueue.java b/services/core/java/com/android/server/wm/SnapshotPersistQueue.java index afef85e34fe0..58e1c544202d 100644 --- 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 { |