fix: Android 14/15 crash

This commit is contained in:
Pun Butrach
2025-11-23 00:34:44 +07:00
parent d36845897b
commit edfd0baad6
1639 changed files with 146874 additions and 93622 deletions
@@ -69,6 +69,7 @@ public class TaskbarControllers {
public final Optional<BubbleControllers> bubbleControllers;
public final TaskbarDesktopModeController taskbarDesktopModeController;
public final NudgeController nudgeController;
public final NudgeViewController nudgeViewController;
@Nullable private LoggableTaskbarController[] mControllersToLog = null;
@Nullable private BackgroundRendererController[] mBackgroundRendererControllers = null;
@@ -118,7 +119,8 @@ public class TaskbarControllers {
TaskbarPinningController taskbarPinningController,
Optional<BubbleControllers> bubbleControllers,
TaskbarDesktopModeController taskbarDesktopModeController,
NudgeController nudgeController) {
NudgeController nudgeController,
NudgeViewController nudgeViewController) {
this.taskbarActivityContext = taskbarActivityContext;
this.taskbarDragController = taskbarDragController;
this.navButtonController = navButtonController;
@@ -147,6 +149,7 @@ public class TaskbarControllers {
this.bubbleControllers = bubbleControllers;
this.taskbarDesktopModeController = taskbarDesktopModeController;
this.nudgeController = nudgeController;
this.nudgeViewController = nudgeViewController;
}
/**
@@ -174,10 +177,11 @@ public class TaskbarControllers {
taskbarOverlayController.init(this);
taskbarAllAppsController.init(this, sharedState.allAppsVisible);
navButtonController.init(this);
bubbleControllers.ifPresent(controllers -> controllers.init(sharedState, this));
bubbleControllers.ifPresentOrElse(controllers -> controllers.init(sharedState, this),
sharedState::clearBubbleData);
taskbarInsetsController.init(this);
voiceInteractionWindowController.init(this);
taskbarRecentAppsController.init(this);
taskbarRecentAppsController.init(this, sharedState.recentTasksBeforeTaskbarRecreate);
taskbarTranslationController.init(this);
taskbarEduTooltipController.init(this);
keyboardQuickSwitchController.init(this);
@@ -245,6 +249,7 @@ public class TaskbarControllers {
}, () -> uiController.onBubbleBarLocationUpdated(null));
// Notify that the ui controller has changed
navbarButtonsViewController.onUiControllerChanged();
taskbarViewController.onUiControllerChanged();
}
@Nullable
@@ -264,7 +269,6 @@ public class TaskbarControllers {
*/
public void onDestroy() {
mAreAllControllersInitialized = false;
mSharedState = null;
taskbarDragController.onDestroy();
navbarButtonsViewController.onDestroy();
@@ -274,6 +278,7 @@ public class TaskbarControllers {
taskbarUnfoldAnimationController.onDestroy();
taskbarViewController.onDestroy();
stashedHandleViewController.onDestroy();
nudgeViewController.onDestroy();
taskbarAutohideSuspendController.onDestroy();
taskbarPopupController.onDestroy();
taskbarForceVisibleImmersiveController.onDestroy();
@@ -289,6 +294,7 @@ public class TaskbarControllers {
taskbarDesktopModeController.onDestroy();
mControllersToLog = null;
mBackgroundRendererControllers = null;
mSharedState = null;
}
/**