From c063e246ce294b05e5795dfa250eaf3b42f718cf Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Tue, 30 Aug 2022 17:40:38 -0700
Subject: [PATCH] Fix a small bug where desktop mode changes might not be
 applied

Currently the window container transaction to apply desktop mode
would only be performed when the setting changes. If desktop mode
is already enabled, there wouldn't be a setting change event for it
being "on" after a reboot.

This CL updates the code to apply the wct in DesktopModeController
onInit, if the setting is enabled.

Test: manual - enable desktop mode via the tile
             - reboot the device
             - open an app
             => app should be in desktop mode
Bug: 241944030
Change-Id: I15df10dd275ef62df2cdcf7aaf22db526a842e97
---
 .../android/wm/shell/desktopmode/DesktopModeController.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java
index e7533bcbed247..7d34ea481de66 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java
@@ -62,6 +62,9 @@ public class DesktopModeController {
     private void onInit() {
         ProtoLog.d(WM_SHELL_DESKTOP_MODE, "Initialize DesktopModeController");
         mSettingsObserver.observe();
+        if (DesktopMode.isActive(mContext)) {
+            updateDesktopModeActive(true);
+        }
     }
 
     @VisibleForTesting