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

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

Merge "Change file permissions for shutdown files" into main am: ae489fac am: 7c7c3923 

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



Change-Id: Ifee45fbc7c65f93116db2e1b21d4d275d83364f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12ad1337 7c7c3923

services/core/java/com/android/server/power/ShutdownCheckPoints.java

+9 −2
Original line number Diff line number Diff line
@@ -350,17 +350,23 @@ public final class ShutdownCheckPoints { 


        private final ShutdownCheckPoints mInstance;

        private final File mBaseFile;

        private final File mBaseDir;

        private final int mFileCountLimit;



        FileDumperThread(ShutdownCheckPoints instance, File baseFile, int fileCountLimit) {

            mInstance = instance;

            mBaseFile = baseFile;

            mBaseDir = baseFile.getParentFile();

            mFileCountLimit = fileCountLimit;

        }



        @Override

        public void run() {

            mBaseFile.getParentFile().mkdirs();

            if (!mBaseDir.exists()) {

                mBaseDir.mkdirs();

                mBaseDir.setExecutable(true, false);

                mBaseDir.setReadable(true, false);

            }

            File[] checkPointFiles = listCheckPointsFiles();



            int filesToDelete = checkPointFiles.length - mFileCountLimit + 1;
@@ -375,7 +381,7 @@ public final class ShutdownCheckPoints { 


        private File[] listCheckPointsFiles() {

            String filePrefix = mBaseFile.getName() + "-";

            File[] files = mBaseFile.getParentFile().listFiles(new FilenameFilter() {

            File[] files = mBaseDir.listFiles(new FilenameFilter() {

                @Override

                public boolean accept(File dir, String name) {

                    if (!name.startsWith(filePrefix)) {
@@ -412,6 +418,7 @@ public final class ShutdownCheckPoints { 
                }

            }

            mBaseFile.renameTo(file);

            file.setReadable(true, false);

        }

    }

}