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

Merge "Simplify finishing flow for activities waiting for next one to resume"

Browse Source
This commit is contained in:
Andrii Kulian
2019-10-09 17:51:37 +00:00
committed by Android (Google) Code Review
parent 9d23418063 34acc1459b
commit 6594be12c9
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -1723,25 +1723,27 @@ final class ActivityRecord extends AppWindowToken {
// implied that the current finishing activity should be added into stopping list rather
// than destroy immediately.
final boolean isNextNotYetVisible = next != null && (!next.nowVisible || !next.visible);
final ActivityStack stack = getActivityStack();
final boolean notFocusedStack = stack != mRootActivityContainer.getTopDisplayFocusedStack();
final boolean notGlobalFocusedStack =
getActivityStack() != mRootActivityContainer.getTopDisplayFocusedStack();
if (isVisible && isNextNotYetVisible) {
// Add this activity to the list of stopping activities. It will be processed and
// destroyed when the next activity reports idle.
addToStopping(false /* scheduleIdle */, false /* idleDelayed */,
"completeFinishing");
if (DEBUG_STATES) {
Slog.v(TAG_STATES, "Moving to STOPPING: " + this + " (finish requested)");
}
setState(STOPPING, "completeFinishing");
if (notFocusedStack) {
if (notGlobalFocusedStack) {
// Ensuring visibility and configuration only for non-focused stacks since this
// method call is relatively expensive and not necessary for focused stacks.
mRootActivityContainer.ensureVisibilityAndConfig(next, getDisplayId(),
false /* markFrozenIfConfigChanged */, true /* deferResume */);
}
} else if (isVisible && isState(PAUSED) && getActivityStack().isFocusedStackOnDisplay()
&& !inPinnedWindowingMode()) {
// TODO(b/137329632): Currently non-focused stack is handled differently.
addToFinishingAndWaitForIdle();
} else if (addToFinishingAndWaitForIdle()) {
// We added this activity to the finishing list and something else is becoming resumed.
// The activity will complete finishing when the next activity reports idle. No need to
// do anything else here.
} else {
// Not waiting for the next one to become visible - finish right away.
// Not waiting for the next one to become visible, and nothing else will be resumed in
// place of this activity - requesting destruction right away.
activityRemoved = destroyIfPossible(reason);
}
@@ -1798,13 +1800,20 @@ final class ActivityRecord extends AppWindowToken {
return activityRemoved;
}
/**
* Add this activity to the list of finishing and trigger resuming of activities in focused
* stacks.
* @return {@code true} if some other activity is being resumed as a result of this call.
*/
@VisibleForTesting
void addToFinishingAndWaitForIdle() {
boolean addToFinishingAndWaitForIdle() {
if (DEBUG_STATES) Slog.v(TAG, "Enqueueing pending finish: " + this);
setState(FINISHING, "addToFinishingAndWaitForIdle");
mStackSupervisor.mFinishingActivities.add(this);
if (!mStackSupervisor.mFinishingActivities.contains(this)) {
mStackSupervisor.mFinishingActivities.add(this);
}
resumeKeyDispatchingLocked();
mRootActivityContainer.resumeFocusedStacksTopActivities();
return mRootActivityContainer.resumeFocusedStacksTopActivities();
}
/**

7
services/tests/wmtests/src/com/android/server/wm/TestActivityDisplay.java
View File

@@ -22,8 +22,11 @@ import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyBoolean;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
import static org.mockito.ArgumentMatchers.any;
import android.hardware.display.DisplayManagerGlobal;
import android.view.Display;
import android.view.DisplayInfo;
@@ -85,6 +88,10 @@ class TestActivityDisplay extends ActivityDisplay {
displayRotation.setRotation(rotation);
return true;
}).when(displayRotation).updateRotationUnchecked(anyBoolean());
final InputMonitor inputMonitor = mDisplayContent.getInputMonitor();
spyOn(inputMonitor);
doNothing().when(inputMonitor).resumeDispatchingLw(any());
}
@SuppressWarnings("TypeParameterUnusedInFormals")