Merge "Add unit tests for 180 degree rotation"

diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStarter.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java
index 53e5a2a,fa4b79f..44d5055
--- 1/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java
--- 2/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java
@@@ -242,42 -212,37 +242,74 @@@ class WindowTestsBase 
                      EMPTY /* overrideConfig*/, RESIZE_MODE_UNRESIZEABLE, false /* homeTask*/,
                      false /* isOnTopLauncher */, true /* toTop*/, true /* showForAllUsers */);
          }
 +
 +        @Override
 +        TestTask createTask(int taskId, TaskStack stack, int userId, Rect bounds,
 +                Configuration overrideConfig, int resizeMode, boolean homeTask,
 +                boolean isOnTopLauncher) {
 +            return new TestTask(taskId, stack, userId, mService, bounds, overrideConfig,
 +                    isOnTopLauncher, resizeMode, homeTask, this);
 +        }
 +    }
 +
 +    class TestAppWindowContainerController extends AppWindowContainerController {
 +
 +        final IApplicationToken mToken;
 +
 +        TestAppWindowContainerController(TestTaskWindowContainerController taskController) {
 +            this(taskController, new TestIApplicationToken());
 +        }
 +
 +        TestAppWindowContainerController(TestTaskWindowContainerController taskController,
 +                IApplicationToken token) {
 +            super(taskController, token, null /* listener */, 0 /* index */,
 +                    SCREEN_ORIENTATION_UNSPECIFIED, true /* fullscreen */,
 +                    true /* showForAllUsers */, 0 /* configChanges */, false /* voiceInteraction */,
 +                    false /* launchTaskBehind */, false /* alwaysFocusable */,
 +                    0 /* targetSdkVersion */, 0 /* rotationAnimationHint */,
 +                    0 /* inputDispatchingTimeoutNanos */, sWm);
 +            mToken = token;
 +        }
 +    }
 +
 +    class TestIApplicationToken implements IApplicationToken {
 +
 +        private final Binder mBinder = new Binder();
 +        @Override
 +        public IBinder asBinder() {
 +            return mBinder;
 +        }
      }
+ 
+     /** Used to track resize reports. */
+     class TestWindowState extends WindowState {
+         boolean resizeReported;
+ 
+         TestWindowState(WindowManager.LayoutParams attrs, WindowToken token) {
+             super(sWm, mMockSession, mIWindow, token, null, OP_NONE, 0, attrs, 0, 0);
+         }
+ 
+         @Override
+         void reportResized() {
+             super.reportResized();
+             resizeReported = true;
+         }
+ 
+         @Override
+         public boolean isGoneForLayoutLw() {
+             return false;
+         }
+ 
+         @Override
+         void updateResizingWindowIfNeeded() {
+             // Used in AppWindowTokenTests#testLandscapeSeascapeRotationRelayout to deceive
+             // the system that it can actually update the window.
+             boolean hadSurface = mHasSurface;
+             mHasSurface = true;
+ 
+             super.updateResizingWindowIfNeeded();
+ 
+             mHasSurface = hadSurface;
+         }
+     }
  }