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

Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev

Browse Source 
am: 211078e1c3

Change-Id: Ie3db2e84ebf21b54645829083c5b88dd2edf8c7d
This commit is contained in:
Chavi Weingarten
2018-03-20 04:30:29 +00:00
committed by android-build-merger
parent 9dcc7b982b 211078e1c3
commit 56ffb646c7
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1356,17 +1356,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
if (DEBUG_USER_LEAVING) Slog.v(TAG_USER_LEAVING, if (DEBUG_USER_LEAVING) Slog.v(TAG_USER_LEAVING,
"Sleep => pause with userLeaving=false"); "Sleep => pause with userLeaving=false");
// If we are in the middle of resuming the top activity in startPausingLocked(false, true, null, false);
// {@link #resumeTopActivityUncheckedLocked}, mResumedActivity will be set but not
// resumed yet. We must not proceed pausing the activity here. This method will be
// called again if necessary as part of {@link #checkReadyForSleep} or
// {@link ActivityStackSupervisor#checkReadyForSleepLocked}.
if (mStackSupervisor.inResumeTopActivity) {
if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "In the middle of resuming top activity "
+ mResumedActivity);
} else {
startPausingLocked(false, true, null, false);
}
shouldSleep = false ; shouldSleep = false ;
} else if (mPausingActivity != null) { } else if (mPausingActivity != null) {
// Still waiting for something to pause; can't sleep yet. // Still waiting for something to pause; can't sleep yet.

18
services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java
View File

@@ -97,24 +97,6 @@ public class ActivityStackTests extends ActivityTestsBase {
assertNotNull(mTask.getWindowContainerController()); assertNotNull(mTask.getWindowContainerController());
} }
@Test
public void testNoPauseDuringResumeTopActivity() throws Exception {
final ActivityRecord r = new ActivityBuilder(mService).setTask(mTask).build();
// Simulate the a resumed activity set during
// {@link ActivityStack#resumeTopActivityUncheckedLocked}.
mSupervisor.inResumeTopActivity = true;
r.setState(RESUMED, "testNoPauseDuringResumeTopActivity");
final boolean waiting = mStack.goToSleepIfPossible(false);
// Ensure we report not being ready for sleep.
assertFalse(waiting);
// Make sure the resumed activity is untouched.
assertEquals(mStack.getResumedActivity(), r);
}
@Test @Test
public void testResumedActivity() throws Exception { public void testResumedActivity() throws Exception {
final ActivityRecord r = new ActivityBuilder(mService).setTask(mTask).build(); final ActivityRecord r = new ActivityBuilder(mService).setTask(mTask).build();