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

Commit 601ccbfb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "To support loading display_settings.xml on treblized builds, include... 

Merge "To support loading display_settings.xml on treblized builds, include the product directory on the search path for the file. If not found, fallback to the vendor directory." into sc-v2-dev am: 1dd864bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15740824

Change-Id: If7092027c2fd467668e0006caddf9f751a814e26
parents 22115418 1dd864bc

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

+7 −1
Original line number Diff line number Diff line
@@ -264,8 +264,14 @@ class DisplayWindowSettingsProvider implements SettingsProvider { 


    @NonNull

    private static AtomicFile getVendorSettingsFile() {

        final File vendorFile = new File(Environment.getVendorDirectory(),

        // First look under product path for treblized builds.

        File vendorFile = new File(Environment.getProductDirectory(),

                VENDOR_DISPLAY_SETTINGS_FILE_PATH);

        if (!vendorFile.exists()) {

            // Try and look in vendor path.

            vendorFile = new File(Environment.getVendorDirectory(),

                VENDOR_DISPLAY_SETTINGS_FILE_PATH);

        }

        return new AtomicFile(vendorFile, WM_DISPLAY_COMMIT_TAG);

    }