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

Commit 360c1ab2 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 am: fd610c5b 

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



Change-Id: Id6de00f86bfd945305676112933f8936e9716c5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d59b1b7 fd610c5b

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);

        }

    }