diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 4 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index a81e228277b5..fec8b331de2d 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -8180,7 +8180,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @ActivityInfo.ScreenOrientation protected int getOverrideOrientation() { int candidateOrientation = super.getOverrideOrientation(); - if (ActivityInfo.isFixedOrientation(candidateOrientation) && isUniversalResizeable()) { + if (candidateOrientation != ActivityInfo.SCREEN_ORIENTATION_LOCKED + && ActivityInfo.isFixedOrientation(candidateOrientation) + && isUniversalResizeable()) { candidateOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; } return mAppCompatController.getOrientationPolicy() diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index e66dfeb8367c..1c878021c9e9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -2895,7 +2895,7 @@ public class SizeCompatTests extends WindowTestsBase { // Launch another portrait fixed app. spyOn(mTask); setBooted(display.mWmService.mAtmService); - final ActivityRecord newActivity = new ActivityBuilder(display.mWmService.mAtmService) + final ActivityRecord newActivity = getActivityBuilderWithoutTask() .setResizeMode(RESIZE_MODE_UNRESIZEABLE) .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT) .setTask(mTask) @@ -2963,7 +2963,7 @@ public class SizeCompatTests extends WindowTestsBase { // Launch another portrait fixed app with max aspect ratio as 1.3. spyOn(mTask); setBooted(display.mWmService.mAtmService); - final ActivityRecord newActivity = new ActivityBuilder(display.mWmService.mAtmService) + final ActivityRecord newActivity = getActivityBuilderWithoutTask() .setResizeMode(RESIZE_MODE_UNRESIZEABLE) .setMaxAspectRatio(1.3f) .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT) @@ -4788,7 +4788,7 @@ public class SizeCompatTests extends WindowTestsBase { final float maxAspect = 1.8f; final float minAspect = 1.5f; prepareLimitedBounds(mActivity, maxAspect, minAspect, - ActivityInfo.SCREEN_ORIENTATION_LOCKED, true /* isUnresizable */); + ActivityInfo.SCREEN_ORIENTATION_NOSENSOR, true /* isUnresizable */); assertTrue(mActivity.isUniversalResizeable()); assertTrue(mActivity.isResizeable()); |