commit 440faf35257727adaa6c90e3d2de1221f28d4d21
author Riddle Hsu <riddlehsu@google.com> Mon Mar 17 18:57:20 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 17 18:57:20 2025 -0700
tree 68971d05c972a95a8fce06594954ebd4f72ef795
parent 88fed15c81e7c558e0a9fd118ab273a813acdeb6
parent a2a11e0b857041e32000acb739c7074152360b2b

Merge "Consider enforce property for desktop mode" into main

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java

diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java
index ed5e0c6..e5a4cd0 100644
--- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java
+++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java
@@ -278,6 +278,9 @@
         if (!canEnterDesktopMode(context)) {
             return false;
         }
+        if (!enforceDeviceRestrictions()) {
+            return true;
+        }
         if (display.getType() == Display.TYPE_INTERNAL) {
             return canInternalDisplayHostDesktops(context);
         }