Merge changes from topic "WindowMagnificationSettingsFix" into main

* changes:
  Fix WindowManager instance used in WindowMagnificationSettings window.
  Revert "Removing use of WindowManagerProvider to create window manager for"

6 files changed, 55 insertions, 26 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java
index c6071a006408..63d56e662a50 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java
@@ -53,6 +53,7 @@ import com.android.systemui.recents.LauncherProxyService;
 import com.android.systemui.settings.DisplayTracker;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.util.settings.SecureSettings;
+import com.android.systemui.utils.windowmanager.WindowManagerProvider;
 
 import java.io.PrintWriter;
 import java.util.concurrent.Executor;
@@ -96,17 +97,19 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
         private final WindowMagnifierCallback mWindowMagnifierCallback;
         private final SysUiState mSysUiState;
         private final SecureSettings mSecureSettings;
+        private final WindowManagerProvider mWindowManagerProvider;
 
         WindowMagnificationControllerSupplier(Context context, Handler handler,
                 WindowMagnifierCallback windowMagnifierCallback,
                 DisplayManager displayManager, SysUiState sysUiState,
-                SecureSettings secureSettings) {
+                SecureSettings secureSettings, WindowManagerProvider windowManagerProvider) {
             super(displayManager);
             mContext = context;
             mHandler = handler;
             mWindowMagnifierCallback = windowMagnifierCallback;
             mSysUiState = sysUiState;
             mSecureSettings = secureSettings;
+            mWindowManagerProvider = windowManagerProvider;
         }
 
         @Override
@@ -114,8 +117,9 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
             final Context windowContext = mContext.createWindowContext(display,
                         TYPE_ACCESSIBILITY_OVERLAY,
                         /* options */ null);
+            final WindowManager windowManager = mWindowManagerProvider
+                    .getWindowManager(windowContext);
             windowContext.setTheme(com.android.systemui.res.R.style.Theme_SystemUI);
-            final WindowManager windowManager = windowContext.getSystemService(WindowManager.class);
 
             Supplier<SurfaceControlViewHost> scvhSupplier = () ->
                     new SurfaceControlViewHost(mContext,
@@ -146,17 +150,20 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
         private final Executor mExecutor;
         private final DisplayManager mDisplayManager;
         private final IWindowManager mIWindowManager;
+        private final WindowManagerProvider mWindowManagerProvider;
 
         FullscreenMagnificationControllerSupplier(Context context,
                 DisplayManager displayManager,
                 Handler handler,
-                Executor executor, IWindowManager iWindowManager) {
+                Executor executor, IWindowManager iWindowManager,
+                WindowManagerProvider windowManagerProvider) {
             super(displayManager);
             mContext = context;
             mHandler = handler;
             mExecutor = executor;
             mDisplayManager = displayManager;
             mIWindowManager = iWindowManager;
+            mWindowManagerProvider = windowManagerProvider;
         }
 
         @Override
@@ -172,7 +179,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
                     mExecutor,
                     mDisplayManager,
                     windowContext.getSystemService(AccessibilityManager.class),
-                    windowContext.getSystemService(WindowManager.class),
+                    mWindowManagerProvider.getWindowManager(windowContext),
                     mIWindowManager,
                     scvhSupplier);
         }
@@ -188,15 +195,17 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
         private final Context mContext;
         private final MagnificationSettingsController.Callback mSettingsControllerCallback;
         private final SecureSettings mSecureSettings;
+        private final WindowManagerProvider mWindowManagerProvider;
 
         SettingsSupplier(Context context,
                 MagnificationSettingsController.Callback settingsControllerCallback,
                 DisplayManager displayManager,
-                SecureSettings secureSettings) {
+                SecureSettings secureSettings, WindowManagerProvider windowManagerProvider) {
             super(displayManager);
             mContext = context;
             mSettingsControllerCallback = settingsControllerCallback;
             mSecureSettings = secureSettings;
+            mWindowManagerProvider = windowManagerProvider;
         }
 
         @Override
@@ -204,12 +213,12 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
             final Context windowContext = mContext.createWindowContext(display,
                     TYPE_ACCESSIBILITY_OVERLAY, /* options */ null);
             windowContext.setTheme(com.android.systemui.res.R.style.Theme_SystemUI);
-
             return new MagnificationSettingsController(
                     windowContext,
                     new SfVsyncFrameCallbackProvider(),
                     mSettingsControllerCallback,
-                    mSecureSettings);
+                    mSecureSettings,
+                    mWindowManagerProvider);
         }
     }
 
@@ -223,10 +232,12 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
             SysUiState sysUiState, LauncherProxyService launcherProxyService,
             SecureSettings secureSettings, DisplayTracker displayTracker,
             DisplayManager displayManager, AccessibilityLogger a11yLogger,
-            IWindowManager iWindowManager, AccessibilityManager accessibilityManager) {
+            IWindowManager iWindowManager, AccessibilityManager accessibilityManager,
+            WindowManagerProvider windowManagerProvider) {
         this(context, mainHandler.getLooper(), executor, commandQueue,
                 modeSwitchesController, sysUiState, launcherProxyService, secureSettings,
-                displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager);
+                displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager,
+                windowManagerProvider);
     }
 
     @VisibleForTesting
@@ -236,7 +247,8 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
             SecureSettings secureSettings, DisplayTracker displayTracker,
             DisplayManager displayManager, AccessibilityLogger a11yLogger,
             IWindowManager iWindowManager,
-            AccessibilityManager accessibilityManager) {
+            AccessibilityManager accessibilityManager,
+            WindowManagerProvider windowManagerProvider) {
         mHandler = new Handler(looper) {
             @Override
             public void handleMessage(@NonNull Message msg) {
@@ -255,11 +267,13 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
         mA11yLogger = a11yLogger;
         mWindowMagnificationControllerSupplier = new WindowMagnificationControllerSupplier(context,
                 mHandler, mWindowMagnifierCallback,
-                displayManager, sysUiState, secureSettings);
+                displayManager, sysUiState, secureSettings, windowManagerProvider);
         mFullscreenMagnificationControllerSupplier = new FullscreenMagnificationControllerSupplier(
-                context, displayManager, mHandler, mExecutor, iWindowManager);
+                context, displayManager, mHandler, mExecutor, iWindowManager,
+                windowManagerProvider);
         mMagnificationSettingsSupplier = new SettingsSupplier(context,
-                mMagnificationSettingsControllerCallback, displayManager, secureSettings);
+                mMagnificationSettingsControllerCallback, displayManager, secureSettings,
+                windowManagerProvider);
 
         mModeSwitchesController.setClickListenerDelegate(
                 displayId -> mHandler.post(() -> {
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java
index 5af34f4ddb34..95206b88f6aa 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationSettingsController.java
@@ -30,6 +30,7 @@ import com.android.internal.accessibility.common.MagnificationConstants;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
 import com.android.systemui.util.settings.SecureSettings;
+import com.android.systemui.utils.windowmanager.WindowManagerProvider;
 
 /**
  * A class to control {@link WindowMagnificationSettings} and receive settings panel callbacks by
@@ -60,8 +61,10 @@ public class MagnificationSettingsController implements ComponentCallbacks {
             @UiContext Context context,
             SfVsyncFrameCallbackProvider sfVsyncFrameProvider,
             @NonNull Callback settingsControllerCallback,
-            SecureSettings secureSettings) {
-        this(context, sfVsyncFrameProvider, settingsControllerCallback,  secureSettings, null);
+            SecureSettings secureSettings,
+            WindowManagerProvider windowManagerProvider) {
+        this(context, sfVsyncFrameProvider, settingsControllerCallback,  secureSettings,
+                windowManagerProvider, null);
     }
 
     @VisibleForTesting
@@ -70,6 +73,7 @@ public class MagnificationSettingsController implements ComponentCallbacks {
             SfVsyncFrameCallbackProvider sfVsyncFrameProvider,
             @NonNull Callback settingsControllerCallback,
             SecureSettings secureSettings,
+            WindowManagerProvider windowManagerProvider,
             WindowMagnificationSettings windowMagnificationSettings) {
         mContext = context.createWindowContext(
                 context.getDisplay(),
@@ -82,10 +86,10 @@ public class MagnificationSettingsController implements ComponentCallbacks {
         if (windowMagnificationSettings != null) {
             mWindowMagnificationSettings = windowMagnificationSettings;
         } else {
-            WindowManager wm = mContext.getSystemService(WindowManager.class);
+            WindowManager windowManager = windowManagerProvider.getWindowManager(mContext);
             mWindowMagnificationSettings = new WindowMagnificationSettings(mContext,
                     mWindowMagnificationSettingsCallback,
-                    sfVsyncFrameProvider, secureSettings, wm);
+                    sfVsyncFrameProvider, secureSettings, windowManager);
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java
index 6d58443d5c8c..7a60cce63a33 100644
--- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java
+++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java
@@ -36,6 +36,7 @@ import com.android.systemui.clipboardoverlay.IntentCreator;
 import com.android.systemui.res.R;
 import com.android.systemui.settings.DisplayTracker;
 import com.android.systemui.settings.UserTracker;
+import com.android.systemui.utils.windowmanager.WindowManagerProvider;
 
 import dagger.Lazy;
 import dagger.Module;
@@ -85,8 +86,9 @@ public interface ClipboardOverlayModule {
      */
     @Provides
     @OverlayWindowContext
-    static WindowManager provideWindowManager(@OverlayWindowContext Context context) {
-        return context.getSystemService(WindowManager.class);
+    static WindowManager provideWindowManager(@OverlayWindowContext Context context,
+            WindowManagerProvider windowManagerProvider) {
+        return windowManagerProvider.getWindowManager(context);
     }
 
     @Provides
diff --git a/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayWindowPropertiesRepository.kt b/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayWindowPropertiesRepository.kt
index 792d3288e96a..aaaaacef001a 100644
--- a/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayWindowPropertiesRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayWindowPropertiesRepository.kt
@@ -31,6 +31,7 @@ import com.android.systemui.display.shared.model.DisplayWindowProperties
 import com.android.systemui.res.R
 import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround
 import com.android.systemui.statusbar.core.StatusBarConnectedDisplays
+import com.android.systemui.utils.windowmanager.WindowManagerUtils
 import com.google.common.collect.HashBasedTable
 import com.google.common.collect.Table
 import java.io.PrintWriter
@@ -110,7 +111,7 @@ constructor(
                 return null
             }
             @SuppressLint("NonInjectedService") // Need to manually get the service
-            val windowManager = context.getSystemService(WindowManager::class.java)
+            val windowManager = WindowManagerUtils.getWindowManager(context)
             val layoutInflater = LayoutInflater.from(context)
             DisplayWindowProperties(displayId, windowType, context, windowManager, layoutInflater)
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ImmersiveModeConfirmation.java b/packages/SystemUI/src/com/android/systemui/statusbar/ImmersiveModeConfirmation.java
index c12742eed169..2a9a47d83dd4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ImmersiveModeConfirmation.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ImmersiveModeConfirmation.java
@@ -79,6 +79,7 @@ import com.android.systemui.res.R;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 import com.android.systemui.shared.system.TaskStackChangeListeners;
 import com.android.systemui.util.settings.SecureSettings;
+import com.android.systemui.utils.windowmanager.WindowManagerProvider;
 
 import javax.inject.Inject;
 
@@ -105,6 +106,7 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca
     private long mShowDelayMs = 0L;
     private final IBinder mWindowToken = new Binder();
     private final CommandQueue mCommandQueue;
+    private final WindowManagerProvider mWindowManagerProvider;
 
     private ClingWindowView mClingWindow;
     /** The wrapper on the last {@link WindowManager} used to add the confirmation window. */
@@ -131,7 +133,8 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca
 
     @Inject
     public ImmersiveModeConfirmation(Context context, CommandQueue commandQueue,
-            SecureSettings secureSettings, @Background Handler backgroundHandler) {
+            SecureSettings secureSettings, @Background Handler backgroundHandler,
+            WindowManagerProvider windowManagerProvider) {
         mSysUiContext = context;
         final Display display = mSysUiContext.getDisplay();
         mDisplayContext = display.getDisplayId() == DEFAULT_DISPLAY
@@ -139,6 +142,7 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca
         mCommandQueue = commandQueue;
         mSecureSettings = secureSettings;
         mBackgroundHandler = backgroundHandler;
+        mWindowManagerProvider = windowManagerProvider;
     }
 
     boolean loadSetting(int currentUserId) {
@@ -523,7 +527,7 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca
         mWindowContextRootDisplayAreaId = rootDisplayAreaId;
         mWindowContext = mDisplayContext.createWindowContext(
                 IMMERSIVE_MODE_CONFIRMATION_WINDOW_TYPE, options);
-        mWindowManager = mWindowContext.getSystemService(WindowManager.class);
+        mWindowManager = mWindowManagerProvider.getWindowManager(mWindowContext);
         return mWindowManager;
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/util/display/DisplayHelper.java b/packages/SystemUI/src/com/android/systemui/util/display/DisplayHelper.java
index 7d1c631e606a..757b2d973312 100644
--- a/packages/SystemUI/src/com/android/systemui/util/display/DisplayHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/util/display/DisplayHelper.java
@@ -21,6 +21,8 @@ import android.hardware.display.DisplayManager;
 import android.view.Display;
 import android.view.WindowManager;
 
+import com.android.systemui.utils.windowmanager.WindowManagerProvider;
+
 import javax.inject.Inject;
 
 /**
@@ -29,14 +31,17 @@ import javax.inject.Inject;
 public class DisplayHelper {
     private final Context mContext;
     private final DisplayManager mDisplayManager;
+    private final WindowManagerProvider mWindowManagerProvider;
 
     /**
      * Default constructor.
      */
     @Inject
-    public DisplayHelper(Context context, DisplayManager displayManager) {
+    public DisplayHelper(Context context, DisplayManager displayManager,
+            WindowManagerProvider windowManagerProvider) {
         mContext = context;
         mDisplayManager = displayManager;
+        mWindowManagerProvider = windowManagerProvider;
     }
 
 
@@ -45,9 +50,8 @@ public class DisplayHelper {
      */
     public Rect getMaxBounds(int displayId, int windowContextType) {
         final Display display = mDisplayManager.getDisplay(displayId);
-        WindowManager windowManager = mContext
-                .createDisplayContext(display).createWindowContext(windowContextType, null)
-                .getSystemService(WindowManager.class);
+        WindowManager windowManager = mWindowManagerProvider.getWindowManager(mContext
+                .createDisplayContext(display).createWindowContext(windowContextType, null));
         return windowManager.getMaximumWindowMetrics().getBounds();
     }
 }