Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81451d3b authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Code cleanup."

parents 3775a3f8 e7cfceb5

services/core/java/com/android/server/wm/WindowAnimator.java

+1 −0
Original line number Diff line number Diff line
@@ -791,6 +791,7 @@ public class WindowAnimator { 
            } else if (dumpAll) {

                pw.print(subPrefix); pw.println("no ScreenRotationAnimation ");

            }

            pw.println();

        }



        pw.println();

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −4
Original line number Diff line number Diff line
@@ -10527,15 +10527,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                scheduleAnimationLocked();

            } else {

                screenRotationAnimation.kill();

                screenRotationAnimation = null;

                mAnimator.setScreenRotationAnimationLocked(displayId, screenRotationAnimation);

                mAnimator.setScreenRotationAnimationLocked(displayId, null);

                updateRotation = true;

            }

        } else {

            if (screenRotationAnimation != null) {

                screenRotationAnimation.kill();

                screenRotationAnimation = null;

                mAnimator.setScreenRotationAnimationLocked(displayId, screenRotationAnimation);

                mAnimator.setScreenRotationAnimationLocked(displayId, null);

            }

            updateRotation = true;

        }