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

Commit e8c54ad0 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

If custom display settings path doesn't exist, fall back to vendor 

settings.

Bug: 178385459
Test: manual
Change-Id: Ia68a1764f6394e8c30532833eac4b387433f53f7
parent 005028d9

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));

    }