diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DisplayDeskState.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DisplayDeskState.aidl
index 59add47..5f45192 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DisplayDeskState.aidl
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DisplayDeskState.aidl
@@ -18,13 +18,11 @@
 
 /**
  * Defines the state of desks on a display whose ID is `displayId`, which is:
- * - `canCreateDesks`: whether it's possible to create new desks on this display.
  * - `activeDeskId`: the currently active desk Id, or `-1` if none is active.
  * - `deskId`: the list of desk Ids of the available desks on this display.
  */
 parcelable DisplayDeskState {
     int displayId;
-    boolean canCreateDesk;
     int activeDeskId;
     int[] deskIds;
 }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl
index 7ed1581..cefbd89 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl
@@ -28,7 +28,7 @@
      * Called once when the listener first gets connected to initialize it with the current state of
      * desks in Shell.
      */
-    void onListenerConnected(in DisplayDeskState[] displayDeskStates);
+    void onListenerConnected(in DisplayDeskState[] displayDeskStates, boolean canCreateDesks);
 
     /** Desktop tasks visibility has changed. Visible if at least 1 task is visible. */
     void onTasksVisibilityChanged(int displayId, int visibleTasksCount);
@@ -49,10 +49,10 @@
     void onExitDesktopModeTransitionStarted(int transitionDuration);
 
     /**
-     * Called when the conditions that allow the creation of a new desk on the display whose ID is
-     * `displayId` changes to `canCreateDesks`. It's also called when a new display is added.
+     * Called when the conditions that allow the creation of a new desk changes. This is a global
+     * state for the entire device.
      */
-    void onCanCreateDesksChanged(int displayId, boolean canCreateDesks);
+    void onCanCreateDesksChanged(boolean canCreateDesks);
 
     /** Called when a desk whose ID is `deskId` is added to the display whose ID is `displayId`. */
     void onDeskAdded(int displayId, int deskId);
