Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Garfield Tan
2023-07-06 17:46:57 +00:00
committed by Android (Google) Code Review
parent d785a3cdfa 312fffa4b9
commit da05223f91
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/LaunchParamsPersister.java
View File

@@ -433,7 +433,7 @@ class LaunchParamsPersister {
final byte[] data = saveParamsToXml(); final byte[] data = saveParamsToXml();
final File launchParamFolder = getLaunchParamFolder(mUserId); final File launchParamFolder = getLaunchParamFolder(mUserId);
if (!launchParamFolder.isDirectory() && !launchParamFolder.mkdirs()) { if (!launchParamFolder.isDirectory() && !launchParamFolder.mkdir()) {
Slog.w(TAG, "Failed to create folder for " + mUserId); Slog.w(TAG, "Failed to create folder for " + mUserId);
return; return;
} }

2
services/core/java/com/android/server/wm/TaskPersister.java
View File

@@ -509,7 +509,7 @@ public class TaskPersister implements PersisterQueue.Listener {
private static boolean createParentDirectory(String filePath) { private static boolean createParentDirectory(String filePath) {
File parentDir = new File(filePath).getParentFile(); File parentDir = new File(filePath).getParentFile();
return parentDir.exists() || parentDir.mkdirs(); return parentDir.isDirectory() || parentDir.mkdir();
} }
private static class TaskWriteQueueItem implements PersisterQueue.WriteQueueItem { private static class TaskWriteQueueItem implements PersisterQueue.WriteQueueItem {

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

@@ -107,6 +107,9 @@ public class LaunchParamsPersisterTests extends WindowTestsBase {
InstrumentationRegistry.getInstrumentation().getContext().getCacheDir(); InstrumentationRegistry.getInstrumentation().getContext().getCacheDir();
mFolder = new File(cacheFolder, "launch_params_tests"); mFolder = new File(cacheFolder, "launch_params_tests");
deleteRecursively(mFolder); deleteRecursively(mFolder);
mFolder.mkdir();
mUserFolderGetter.apply(TEST_USER_ID).mkdir();
mUserFolderGetter.apply(ALTERNATIVE_USER_ID).mkdir();
mDisplayUniqueId = "test:" + sNextUniqueId++; mDisplayUniqueId = "test:" + sNextUniqueId++;
mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500) mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500)