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

Commit 358c6268 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Removing disk access from startActivity thread" into nyc-dev am: 6c0ead99 am: 2537c274 

am: 45ccac03

* commit '45ccac03':
  Removing disk access from startActivity thread

Change-Id: I8d2fb6c8b7df7bb6c9125cac6123253d434285f9
parents a7d12c80 45ccac03

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

+10 −11
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.server.am;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.os.Debug;
@@ -519,7 +517,7 @@ public class TaskPersister { 
        if (DEBUG) Slog.d(TAG, "removeObsoleteFiles: persistentTaskIds=" + persistentTaskIds +

                " files=" + files);

        if (files == null) {

            Slog.e(TAG, "File error accessing recents directory (too many files open?).");

            Slog.e(TAG, "File error accessing recents directory (directory doesn't exist?).");

            return;

        }

        for (int fileNdx = 0; fileNdx < files.length; ++fileNdx) {
@@ -597,15 +595,12 @@ public class TaskPersister { 
    }



    static File getUserImagesDir(int userId) {

        File userImagesDir = new File(Environment.getDataSystemCeDirectory(userId), IMAGES_DIRNAME);



        if (!userImagesDir.exists()) {

            if (!userImagesDir.mkdir()) {

                Slog.e(TAG, "Failure creating images directory for user " + userId + ": "

                        + userImagesDir);

            }

        return new File(Environment.getDataSystemCeDirectory(userId), IMAGES_DIRNAME);

    }

        return userImagesDir;



    private static boolean createParentDirectory(String filePath) {

        File parentDir = new File(filePath).getParentFile();

        return parentDir.exists() || parentDir.mkdirs();

    }



    private class LazyTaskWriterThread extends Thread {
@@ -693,6 +688,10 @@ public class TaskPersister { 
                if (item instanceof ImageWriteQueueItem) {

                    ImageWriteQueueItem imageWriteQueueItem = (ImageWriteQueueItem) item;

                    final String filePath = imageWriteQueueItem.mFilePath;

                    if (!createParentDirectory(filePath)) {

                        Slog.e(TAG, "Error while creating images directory for file: " + filePath);

                        continue;

                    }

                    final Bitmap bitmap = imageWriteQueueItem.mImage;

                    if (DEBUG) Slog.d(TAG, "writing bitmap: filename=" + filePath);

                    FileOutputStream imageFile = null;