summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Graciela Putri <gracielawputri@google.com> 2024-09-26 16:57:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-09-26 16:57:30 +0000
commiteefe8b0ec05ca546f04b786db9024efca723b50c (patch)
tree148f326aa29c69951835c4d34ae5e4803b3adb62
parentb450d0b54b5313aeba4a2156e3a24bfcffcd3e3d (diff)
parenta022e0de543aa17d599b65b181d2b2c181899df5 (diff)
Merge "Rename to setTopActivityOrganizedTask" into main
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java2
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java
index 639834374c1f..92205f391f32 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java
@@ -230,7 +230,7 @@ class AppCompatActivityRobot {
mDisplayContent.setIgnoreOrientationRequest(enabled);
}
- void setTopOrganizedTaskAsTopTask() {
+ void setTopActivityOrganizedTask() {
doReturn(mTaskStack.top()).when(mActivityStack.top()).getOrganizedTask();
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java
index 3f34b81487ed..d8373c5dc3d6 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java
@@ -150,7 +150,7 @@ public class AppCompatUtilsTest extends WindowTestsBase {
robot.applyOnActivity((a) -> {
a.createActivityWithComponentInNewTask();
a.setIgnoreOrientationRequest(true);
- a.setTopOrganizedTaskAsTopTask();
+ a.setTopActivityOrganizedTask();
a.setTopActivityInSizeCompatMode(true);
a.setTopActivityVisible(true);
});