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

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

Merge "close the opend resources when IOException happen." into main am: c168612c 

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



Change-Id: I109a375662258c7c3c5e13f590ed368aa9af0411
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b34ce2d c168612c

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

+4 −2
Original line number Diff line number Diff line
@@ -245,18 +245,20 @@ public class TaskPersister implements PersisterQueue.Listener { 


    private static String fileToString(File file) {

        final String newline = System.lineSeparator();

        BufferedReader reader = null;

        try {

            BufferedReader reader = new BufferedReader(new FileReader(file));

            reader = new BufferedReader(new FileReader(file));

            StringBuffer sb = new StringBuffer((int) file.length() * 2);

            String line;

            while ((line = reader.readLine()) != null) {

                sb.append(line + newline);

            }

            reader.close();

            return sb.toString();

        } catch (IOException ioe) {

            Slog.e(TAG, "Couldn't read file " + file.getName());

            return null;

        } finally {

            IoUtils.closeQuietly(reader);

        }

    }