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

Commit ce11d229 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android (Google) Code Review
Browse files

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

parents 8ce6b9fb e8c54ad0

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

+4 −3
Original line number Diff line number Diff line
@@ -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));

    }