From 8dd4a32ee4bbd84cf78b592941e501047e90d91c Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Sep 2021 08:35:27 +0100 Subject: [PATCH] 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. Bug: 198411988 Test: Manual Change-Id: I542d68fa9fcb8ebf19c3c193377e11257e1f4e9a --- .../android/server/wm/DisplayWindowSettingsProvider.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java b/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java index 8fcdf2e96889c..4a70fa336838f 100644 --- a/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java +++ b/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java @@ -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); }