diff options
| author | Schneider Victor-tulias <victortulias@google.com> | 2023-05-31 22:07:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-31 22:07:57 +0000 |
| commit | 2b06cbc74842135c3a88f077eb5b6e5accd33d4c (patch) | |
| tree | da4e758a8f76366377d2fd2aa326dfe1651b029b /src/com/android | |
| parent | e208e02abacd1044f16182d208a8b87158f99bb4 (diff) | |
| parent | fb2affac5f624e570497f63882461166924981d9 (diff) | |
| download | Launcher3-2b06cbc74842135c3a88f077eb5b6e5accd33d4c.tar.gz | |
Merge "Fix flaky null pointer in LauncherWidgetHolder" into udc-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0b75c4509e..28f378d128 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -518,11 +518,12 @@ public class Launcher extends StatefulActivity<LauncherState> // 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); |