Merge "Notify Home visibility even when DragToDesktop START aborted" into main

2 files changed, 2 insertions, 3 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java
index 23dfb41d52c1..cca982142a3a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java
@@ -153,7 +153,6 @@ public class HomeTransitionObserver implements TransitionObserver,
             return;
         }
         mPendingStartDragTransition = null;
-        if (aborted) return;
 
         if (mPendingHomeVisibilityUpdate != null) {
             notifyHomeVisibilityChanged(mPendingHomeVisibilityUpdate);
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java
index a122c3820dcb..55bff09e0ae2 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java
@@ -222,7 +222,7 @@ public class HomeTransitionObserverTest extends ShellTestCase {
 
     @Test
     @EnableFlags({FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX})
-    public void startDragToDesktopAborted_doesNotTriggerCallback() throws RemoteException {
+    public void startDragToDesktopAborted_triggersCallback() throws RemoteException {
         TransitionInfo info = mock(TransitionInfo.class);
         TransitionInfo.Change change = mock(TransitionInfo.Change.class);
         ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class);
@@ -239,7 +239,7 @@ public class HomeTransitionObserverTest extends ShellTestCase {
 
         mHomeTransitionObserver.onTransitionFinished(transition, /* aborted= */ true);
 
-        verify(mListener, never()).onHomeVisibilityChanged(/* isVisible= */ anyBoolean());
+        verify(mListener).onHomeVisibilityChanged(/* isVisible= */ true);
     }
 
     @Test