Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a delay to rotation updates to help avoid fold state race" into tm-qpr-dev am: d094fe2516 am: 1d480ca06e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22122422

Change-Id: Ic4020fa21c634520d79ab641bf38fc967192d601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Will Osborn
2023-03-23 14:09:11 +00:00
committed by Automerger Merge Worker
parent aee5c18251 1d480ca06e
commit dad0c5569b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/DisplayRotation.java
View File

@@ -87,6 +87,8 @@ import java.util.Set;
*/
public class DisplayRotation {
private static final String TAG = TAG_WITH_CLASS_NAME ? "DisplayRotation" : TAG_WM;
// Delay to avoid race between fold update and orientation update.
private static final int ORIENTATION_UPDATE_DELAY_MS = 800;
// Delay in milliseconds when updating config due to folding events. This prevents
// config changes and unexpected jumps while folding the device to closed state.
@@ -1787,15 +1789,15 @@ public class DisplayRotation {
mDeviceState = newState;
// Now mFoldState is set to HALF_FOLDED, the overrideFrozenRotation function will
// return true, so rotation is unlocked.
mService.updateRotation(false /* alwaysSendConfiguration */,
false /* forceRelayout */);
} else {
mInHalfFoldTransition = true;
mDeviceState = newState;
// Tell the device to update its orientation.
mService.updateRotation(false /* alwaysSendConfiguration */,
false /* forceRelayout */);
}
UiThread.getHandler().postDelayed(
() -> {
mService.updateRotation(false /* alwaysSendConfiguration */,
false /* forceRelayout */);
}, ORIENTATION_UPDATE_DELAY_MS);
// Alert the activity of possible new bounds.
UiThread.getHandler().removeCallbacks(mActivityBoundsUpdateCallback);
UiThread.getHandler().postDelayed(mActivityBoundsUpdateCallback,

4
services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
View File

@@ -792,7 +792,7 @@ public class DisplayRotationTests {
// ... until half-fold
mTarget.foldStateChanged(DeviceStateController.DeviceState.HALF_FOLDED);
assertTrue(waitForUiHandler());
verify(sMockWm).updateRotation(false, false);
verify(sMockWm).updateRotation(anyBoolean(), anyBoolean());
assertTrue(waitForUiHandler());
assertEquals(Surface.ROTATION_0, mTarget.rotationForOrientation(
SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0));
@@ -800,7 +800,7 @@ public class DisplayRotationTests {
// ... then transition back to flat
mTarget.foldStateChanged(DeviceStateController.DeviceState.OPEN);
assertTrue(waitForUiHandler());
verify(sMockWm, atLeast(1)).updateRotation(false, false);
verify(sMockWm, atLeast(1)).updateRotation(anyBoolean(), anyBoolean());
assertTrue(waitForUiHandler());
assertEquals(Surface.ROTATION_270, mTarget.rotationForOrientation(
SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_0));