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

Commit da05223f authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Avoid making the user ID dir under system_ce in ATMS" into udc-qpr-dev

parents d785a3cd 312fffa4

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

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ class LaunchParamsPersister { 
            final byte[] data = saveParamsToXml();



            final File launchParamFolder = getLaunchParamFolder(mUserId);

            if (!launchParamFolder.isDirectory() && !launchParamFolder.mkdirs()) {

            if (!launchParamFolder.isDirectory() && !launchParamFolder.mkdir()) {

                Slog.w(TAG, "Failed to create folder for " + mUserId);

                return;

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ public class TaskPersister implements PersisterQueue.Listener { 


    private static boolean createParentDirectory(String filePath) {

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

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

        return parentDir.isDirectory() || parentDir.mkdir();

    }



    private static class TaskWriteQueueItem implements PersisterQueue.WriteQueueItem {

services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ public class LaunchParamsPersisterTests extends WindowTestsBase { 
                InstrumentationRegistry.getInstrumentation().getContext().getCacheDir();

        mFolder = new File(cacheFolder, "launch_params_tests");

        deleteRecursively(mFolder);

        mFolder.mkdir();

        mUserFolderGetter.apply(TEST_USER_ID).mkdir();

        mUserFolderGetter.apply(ALTERNATIVE_USER_ID).mkdir();



        mDisplayUniqueId = "test:" + sNextUniqueId++;

        mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500)