From 69771802d5b4914050e48930ce7e5bec7a41eb2a Mon Sep 17 00:00:00 2001 From: Chris Li Date: Fri, 4 Dec 2020 12:03:35 -0800 Subject: [PATCH] Fix conflict on rename setLastFocusedTaskDisplayArea Fix: 174861731 Test: atest WmTests:DualDisplayAreaGroupPolicyTest Change-Id: Iee69a8be39e30b97221077417f186c60e44ec4db --- .../server/wm/DualDisplayAreaGroupPolicyTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/DualDisplayAreaGroupPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/DualDisplayAreaGroupPolicyTest.java index 73e886f67cd3d..eebc207d2d4f6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DualDisplayAreaGroupPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/DualDisplayAreaGroupPolicyTest.java @@ -110,7 +110,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { @Test public void testNotIgnoreOrientationRequest_differentOrientationFromDisplay_reversesRequest() { mFirstRoot.setIgnoreOrientationRequest(false /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); prepareUnresizable(mFirstActivity, SCREEN_ORIENTATION_LANDSCAPE); @@ -127,7 +127,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { public void testNotIgnoreOrientationRequest_onlyRespectsFocusedTaskDisplayArea() { mFirstRoot.setIgnoreOrientationRequest(false /* ignoreOrientationRequest */); mSecondRoot.setIgnoreOrientationRequest(false /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); // Second TDA is not focused, so Display won't get the request prepareUnresizable(mSecondActivity, SCREEN_ORIENTATION_LANDSCAPE); @@ -144,7 +144,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { public void testIgnoreOrientationRequest_displayDoesNotReceiveOrientationChange() { mFirstRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); mSecondRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); prepareUnresizable(mFirstActivity, SCREEN_ORIENTATION_LANDSCAPE); @@ -156,7 +156,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { public void testLaunchPortraitApp_fillsDisplayAreaGroup() { mFirstRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); mSecondRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); prepareUnresizable(mFirstActivity, SCREEN_ORIENTATION_PORTRAIT); final Rect dagBounds = new Rect(mFirstRoot.getBounds()); @@ -174,7 +174,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { public void testLaunchPortraitApp_sizeCompatAfterRotation() { mFirstRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); mSecondRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); prepareUnresizable(mFirstActivity, SCREEN_ORIENTATION_PORTRAIT); final Rect dagBounds = new Rect(mFirstRoot.getBounds()); @@ -207,7 +207,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { public void testLaunchLandscapeApp_taskIsLetterboxInDisplayAreaGroup() { mFirstRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); mSecondRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); prepareUnresizable(mFirstActivity, SCREEN_ORIENTATION_LANDSCAPE); final Rect dagBounds = new Rect(mFirstRoot.getBounds()); @@ -227,7 +227,7 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { public void testLaunchLandscapeApp_taskLetterboxBecomesActivityLetterboxAfterRotation() { mFirstRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); mSecondRoot.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); - mDisplay.setLastFocusedTaskDisplayArea(mFirstTda); + mDisplay.onLastFocusedTaskDisplayAreaChanged(mFirstTda); prepareUnresizable(mFirstActivity, SCREEN_ORIENTATION_LANDSCAPE); final Rect dagBounds = new Rect(mFirstRoot.getBounds());