From a074315f1601289724199e4e742f57246f8bcedd Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Thu, 23 Feb 2023 17:22:36 -0800 Subject: [PATCH] Move registerConfigProvider call before registerDataProvider. `registerDataProvider` invokes `registerListener`, which calls `onSmartspaceTargetsUpdated` and eventually `CardPagerAdapter.setTargets`. `CardPagerAdapter.setTargets` (and also `onSmartSpaceTargetsUpdated, after ag/21572853) uses the config provider. We should set the config provider to the correct one before used. Bug: 270629477 Bug: 262630440 Test: manual Test: passes existing tests Change-Id: I898c012cd4b26e8b2be91ef900ccc384a4bafbbe --- .../statusbar/lockscreen/LockscreenSmartspaceController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt index 6ef6165bcbb3b..3eb2c827cd7b0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt @@ -330,9 +330,9 @@ constructor( } val ssView = plugin.getView(parent) + configPlugin?.let { ssView.registerConfigProvider(it) } ssView.setUiSurface(BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD) ssView.registerDataProvider(plugin) - configPlugin?.let { ssView.registerConfigProvider(it) } ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter { override fun startIntent(view: View, intent: Intent, showOnLockscreen: Boolean) {