Fix activity manager timeout during shutdown
Flip the return value for ActivityStack.goToSleepIfPossible from true if
something needs to be done to true if the stack successfully went to
sleep. An incorrect check in ActivityStack.checkReadyForSleep was
causing ActivityStackSupervisor to sometimes not get notified when a
stack finished stopping during shutdown. Also, no-delay calls to
ActivityStackSupervisor#checkReadyForSleepLocked would fail to put
activities to sleep.
BUG: 64756886
Test: go/run-boottest
Change-Id: Icec590ed9a0e0f035881b7eb03a280787dcfced1
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 1c18954..68a4ad9 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3173,15 +3173,7 @@
boolean timedout = false;
final long endTime = System.currentTimeMillis() + timeout;
while (true) {
- boolean cantShutdown = false;
- for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
- final ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;
- for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
- cantShutdown |=
- stacks.get(stackNdx).goToSleepIfPossible(true /* shuttingDown */);
- }
- }
- if (cantShutdown) {
+ if (!putStacksToSleepLocked(true /* allowDelay */, true /* shuttingDown */)) {
long timeRemaining = endTime - System.currentTimeMillis();
if (timeRemaining > 0) {
try {
@@ -3268,19 +3260,8 @@
return;
}
- if (allowDelay) {
- boolean dontSleep = false;
- for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
- final ActivityDisplay display = mActivityDisplays.valueAt(displayNdx);
- final ArrayList<ActivityStack> stacks = display.mStacks;
- for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
- dontSleep |= stacks.get(stackNdx).goToSleepIfPossible(false /* shuttingDown */);
- }
- }
-
- if (dontSleep) {
- return;
- }
+ if (!putStacksToSleepLocked(allowDelay, false /* shuttingDown */)) {
+ return;
}
// Send launch end powerhint before going sleep
@@ -3296,6 +3277,23 @@
}
}
+ // Tries to put all activity stacks to sleep. Returns true if all stacks were
+ // successfully put to sleep.
+ private boolean putStacksToSleepLocked(boolean allowDelay, boolean shuttingDown) {
+ boolean allSleep = true;
+ for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
+ final ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;
+ for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
+ if (allowDelay) {
+ allSleep &= stacks.get(stackNdx).goToSleepIfPossible(shuttingDown);
+ } else {
+ stacks.get(stackNdx).goToSleep();
+ }
+ }
+ }
+ return allSleep;
+ }
+
boolean reportResumedActivityLocked(ActivityRecord r) {
final ActivityStack stack = r.getStack();
if (isFocusedStack(stack)) {