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

Commit bc1b1102 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Make FileUtils#createDir threadsafe" am: 52320822 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6449b55a42994f8c35854bbe698ad2c697ab0244
parents e57540d0 52320822

core/java/android/os/FileUtils.java

+15 −5
Original line number Diff line number Diff line
@@ -1235,9 +1235,9 @@ public final class FileUtils { 
    }



    /**

     * Creates a directory with name {@code name} under an existing directory {@code baseDir}.

     * Returns a {@code File} object representing the directory on success, {@code null} on

     * failure.

     * Creates a directory with name {@code name} under an existing directory {@code baseDir} if it

     * doesn't exist already. Returns a {@code File} object representing the directory if it exists

     * and {@code null} if not.

     *

     * @hide

     */
@@ -1247,13 +1247,23 @@ public final class FileUtils { 
        return createDir(dir) ? dir : null;

    }



    /** @hide */

    /**

     * Ensure the given directory exists, creating it if needed. This method is threadsafe.

     *

     * @return false if the directory doesn't exist and couldn't be created

     *

     * @hide

     */

    public static boolean createDir(File dir) {

        if (dir.mkdir()) {

            return true;

        }



        if (dir.exists()) {

            return dir.isDirectory();

        }



        return dir.mkdir();

        return false;

    }



    /**