diff options
| author | Schneider Victor-tulias <victortulias@google.com> | 2023-05-26 15:09:41 -0700 |
|---|---|---|
| committer | Schneider Victor-tulias <victortulias@google.com> | 2023-05-26 15:09:41 -0700 |
| commit | fb2affac5f624e570497f63882461166924981d9 (patch) | |
| tree | 30e4ab1e80f119701f9da64f558d1652f4c55336 /src | |
| parent | 883871e2800e397bec948cc2b5fd841322a7fdc6 (diff) | |
| download | Launcher3-fb2affac5f624e570497f63882461166924981d9.tar.gz | |
Fix flaky null pointer in LauncherWidgetHolder
- LauncherWidgetHolder.startListening is called before Launcher.setupView, so it's possible for getWorkspace() to be called as part of the appWidgetRemovedCallback. Reordered these calls to fix this null pointer
Flag: not needed
Fixes: 283850341
Test: Screenshot tests
Change-Id: Ied1f23647721fc4199eab2a5a79def1e306b00f3
Diffstat (limited to 'src')
| -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); |