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

Merge "Do not pause initializing activities when becoming visible."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-16 21:15:28 +00:00
committed by Android (Google) Code Review
parent 4fe3599987 052957b6c0
commit f59809c014
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -1609,9 +1609,8 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
mStackSupervisor.mStoppingActivities.remove(this);
mStackSupervisor.mGoingToSleepActivities.remove(this);
// If an activity is not in the paused state when becoming visible, cycle to the paused
// state.
if (state != PAUSED) {
// If the activity is stopped or stopping, cycle to the paused state.
if (state == STOPPED || state == STOPPING) {
// An activity must be in the {@link PAUSING} state for the system to validate
// the move to {@link PAUSED}.
state = PAUSING;

9
services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java
View File

@@ -22,6 +22,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
import static android.view.Display.DEFAULT_DISPLAY;
import static com.android.server.am.ActivityStack.ActivityState.INITIALIZING;
import static com.android.server.am.ActivityStack.ActivityState.PAUSING;
import static com.android.server.am.ActivityStack.ActivityState.STOPPED;
import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING;
@@ -122,7 +123,15 @@ public class ActivityRecordTests extends ActivityTestsBase {
mActivity.makeVisibleIfNeeded(null /* starting */);
assertEquals(mActivity.state, PAUSING);
assertTrue(pauseFound.value);
// Make sure that the state does not change for current non-stopping states.
mActivity.state = INITIALIZING;
mActivity.makeVisibleIfNeeded(null /* starting */);
assertEquals(mActivity.state, INITIALIZING);
}
@Test