commit 2b06cbc74842135c3a88f077eb5b6e5accd33d4c
author Schneider Victor-tulias <victortulias@google.com> Wed May 31 22:07:57 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 31 22:07:57 2023 +0000
tree da4e758a8f76366377d2fd2aa326dfe1651b029b
parent e208e02abacd1044f16182d208a8b87158f99bb4
parent fb2affac5f624e570497f63882461166924981d9

Merge "Fix flaky null pointer in LauncherWidgetHolder" into udc-dev

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0b75c45..28f378d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -518,11 +518,12 @@
         // TODO: move the SearchConfig to SearchState when new LauncherState is created.
         mBaseSearchConfig = new BaseSearchConfig();
 
+        setupViews();
+
         mAppWidgetManager = new WidgetManagerHelper(this);
         mAppWidgetHolder = createAppWidgetHolder();
         mAppWidgetHolder.startListening();
 
-        setupViews();
         mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots);
 
         boolean internalStateHandled = ACTIVITY_TRACKER.handleCreate(this);