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

Commit c191e9a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ensure the opend resources are eventually closed when IOException... 

Merge "ensure the opend resources are eventually closed when IOException happen." into main am: 3b463ca4 am: c961b455

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



Change-Id: I44a412fb7524e7b8bf547fcb7b158f0ab0d361d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6590e6d c961b455

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

+2 −6
Original line number Diff line number Diff line
@@ -407,10 +407,8 @@ class SnapshotPersistQueue { 
            bitmap.recycle();



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

            try {

                FileOutputStream fos = new FileOutputStream(file);

            try (FileOutputStream fos = new FileOutputStream(file)) {

                swBitmap.compress(JPEG, COMPRESS_QUALITY, fos);

                fos.close();

            } catch (IOException e) {

                Slog.e(TAG, "Unable to open " + file + " for persisting.", e);

                return false;
@@ -428,10 +426,8 @@ class SnapshotPersistQueue { 
            swBitmap.recycle();



            final File lowResFile = mPersistInfoProvider.getLowResolutionBitmapFile(mId, mUserId);

            try {

                FileOutputStream lowResFos = new FileOutputStream(lowResFile);

            try (FileOutputStream lowResFos = new FileOutputStream(lowResFile)) {

                lowResBitmap.compress(JPEG, COMPRESS_QUALITY, lowResFos);

                lowResFos.close();

            } catch (IOException e) {

                Slog.e(TAG, "Unable to open " + lowResFile + " for persisting.", e);

                return false;