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

Merge "If custom display settings path doesn't exist, fall back to vendor settings." into sc-dev

Browse Source
This commit is contained in:
Ben Murdoch
2021-02-10 11:51:41 +00:00
committed by Android (Google) Code Review
parent 8ce6b9fbd9 e8c54ad0e9
commit ce11d229fd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java
View File

@@ -109,12 +109,13 @@ class DisplayWindowSettingsProvider implements SettingsProvider {
*/
void setBaseSettingsFilePath(@Nullable String path) {
AtomicFile settingsFile;
if (path != null) {
settingsFile = new AtomicFile(new File(path), WM_DISPLAY_COMMIT_TAG);
File file = path != null ? new File(path) : null;
if (file != null && file.exists()) {
settingsFile = new AtomicFile(file, WM_DISPLAY_COMMIT_TAG);
} else {
Slog.w(TAG, "display settings " + path + " does not exist, using vendor defaults");
settingsFile = getVendorSettingsFile();
}
setBaseSettingsStorage(new AtomicFileStorage(settingsFile));
}