From 707c9334b2de813c28d23059017d478916c6fbd7 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Tue, 27 Oct 2020 16:58:50 -0700 Subject: [PATCH] Prepare SysUI Builder before building it. Some SysUI sub-classes run more preparation work, so run that before actually building SysUI. Bug: 171437275 Bug: 171436765 Bug: 171837859 Test: Boot OEM devices that require preparation, boots correctly Change-Id: I7b83d83e38501ef531ef1b272738b21c6d2496a2 --- .../SystemUI/src/com/android/systemui/SystemUIFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index 187c31f43a644..4f9d84de36a2e 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -101,11 +101,13 @@ public class SystemUIFactory { if (initializeComponents) { // Only initialize when not starting from tests since this currently initializes some // components that shouldn't be run in the test environment - builder = builder.setPip(mWMComponent.getPip()) + builder = prepareSysUIComponentBuilder(builder, mWMComponent) + .setPip(mWMComponent.getPip()) .setSplitScreen(mWMComponent.getSplitScreen()) .setOneHanded(mWMComponent.getOneHanded()) .setShellDump(mWMComponent.getShellDump()); } else { + // TODO: Call on prepareSysUIComponentBuilder but not with real components. builder = builder.setPip(Optional.ofNullable(null)) .setSplitScreen(Optional.ofNullable(null)) .setOneHanded(Optional.ofNullable(null))