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

Merge "Defer ending launcher power mode hint until after transient transition" into udc-dev am: 058c3d61de

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

Change-Id: I975adebfcbe33fa90414be411ead8bfd9513db7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-07-18 02:11:58 +00:00
committed by Automerger Merge Worker
parent 9763c6d139 058c3d61de
commit 9856ec7369
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -3212,6 +3212,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
+ "not idle", rootTask.getRootTaskId(), resumedActivity);
return false;
}
if (mTransitionController.isTransientLaunch(resumedActivity)) {
// Not idle if the transient transition animation is running.
return false;
}
}
// End power mode launch when idle.
mService.endLaunchPowerMode(ActivityTaskManagerService.POWER_MODE_REASON_START_ACTIVITY);

10
services/tests/wmtests/src/com/android/server/wm/TransitionTests.java
View File

@@ -61,6 +61,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -1425,6 +1426,15 @@ public class TransitionTests extends WindowTestsBase {
// No need to wait for the activity in transient hide task.
assertEquals(WindowContainer.SYNC_STATE_NONE, activity1.mSyncState);
// An active transient launch overrides idle state to avoid clearing power mode before the
// transition is finished.
spyOn(mRootWindowContainer.mTransitionController);
doAnswer(invocation -> controller.isTransientLaunch(invocation.getArgument(0))).when(
mRootWindowContainer.mTransitionController).isTransientLaunch(any());
activity2.getTask().setResumedActivity(activity2, "test");
activity2.idle = true;
assertFalse(mRootWindowContainer.allResumedActivitiesIdle());
activity1.setVisibleRequested(false);
activity2.setVisibleRequested(true);
activity2.setVisible(true);