Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6978f93 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Guard against failed bitmap conversions" into udc-dev am:...

Merge "Merge "Guard against failed bitmap conversions" into udc-dev am: 4c45ee8c am: 65aa8b07" into udc-d1-dev-plus-aosp am: 39bcb529

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23493540



Change-Id: I3e28e9059e9768da58916b554071cabc9ddaea8b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ba472af 39bcb529
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -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 {