From afc54cf30f9c3adb4038dc3363cf47bbefc01564 Mon Sep 17 00:00:00 2001
From: chaviw <chaviw@google.com>
Date: Tue, 5 May 2020 09:54:53 -0700
Subject: [PATCH] Notify Accessibilty about rotation in applyRotation

There were multiple places where WM could notify accessibility about
rotation. This was causing issues where some edge cases would prevent WM
from notifying accessibility. Instead, just notify accessibility when
the rotation is getting applied regardless of what animation ran or
didn't. This makes it clear that accessibility will be notified after
any rotation occurs on WM side.

Bug: 152537982
Bug: 152610840
Test: 1. Go to an app and turn on magnification bounds
      2. Rotate the screen to landscape
      3. Lock the screen
      4. Unlock the screen. App should be back in portrait
      5. Press magnify button
Change-Id: If6019b1e9be178774f0c22a30657e6c3bae27d61
---
 .../core/java/com/android/server/wm/DisplayContent.java    | 4 +---
 .../com/android/server/wm/ScreenRotationAnimation.java     | 7 -------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 72e38386f1f98..93cdbfe0cbbb9 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1620,9 +1620,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
             }
         }
 
-        // Announce rotation only if we will not animate as we already have the
-        // windows in final state. Otherwise, we make this call at the rotation end.
-        if (screenRotationAnimation == null && mWmService.mAccessibilityController != null) {
+        if (mWmService.mAccessibilityController != null) {
             mWmService.mAccessibilityController.onRotationChangedLocked(this);
         }
     }
diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
index 90936efe67157..14ab2e364a1b6 100644
--- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -732,13 +732,6 @@ class ScreenRotationAnimation {
                 mService.mAnimator.mBulkUpdateParams |= WindowSurfacePlacer.SET_UPDATE_ROTATION;
                 kill();
                 mService.updateRotation(false, false);
-                AccessibilityController accessibilityController = mService.mAccessibilityController;
-
-                if (accessibilityController != null) {
-                    // We just finished rotation animation which means we did not
-                    // announce the rotation and waited for it to end, announce now.
-                    accessibilityController.onRotationChangedLocked(mDisplayContent);
-                }
             }
         }