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

Commit 61270d23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Guard against failed bitmap conversions" into udc-dev am: 4c45ee8c am: 67f3022a 

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



Change-Id: I6ddf78d00ffb636d0b63f68df2b6f8ed69ef74d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77ebe859 67f3022a

services/core/java/com/android/server/wm/SnapshotPersistQueue.java

+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 {