Refactor reporting activity idle
- Separate the logic of stopping and finishing from idle.
- Correct the condition of stop profiling from idle.
- Remove the resuming of focused stack if an activity is
removed while idle, because if idle is scheduled or reported,
the next focused activity should be ready to show, then the
resuming from background destruction is a no-op.
Bug: 130340090
Test: atest ActivityLifecycleTests
Change-Id: Iabccc26f40c8cbccb8e4a260d8aff84322193f2b
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ac1dbc4..8bccbbf 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -1684,20 +1684,16 @@
public final void activityIdle(IBinder token, Configuration config, boolean stopProfiling) {
final long origId = Binder.clearCallingIdentity();
try {
- WindowProcessController proc = null;
synchronized (mGlobalLock) {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "activityIdle");
- ActivityStack stack = ActivityRecord.getStackLocked(token);
- if (stack == null) {
+ final ActivityRecord r = ActivityRecord.forTokenLocked(token);
+ if (r == null) {
return;
}
- final ActivityRecord r = mStackSupervisor.activityIdleInternalLocked(token,
- false /* fromTimeout */, false /* processPausingActivities */, config);
- if (r != null) {
- proc = r.app;
- }
- if (stopProfiling && proc != null) {
- proc.clearProfilerIfNeeded();
+ mStackSupervisor.activityIdleInternal(r, false /* fromTimeout */,
+ false /* processPausingActivities */, config);
+ if (stopProfiling && r.hasProcess()) {
+ r.app.clearProfilerIfNeeded();
}
}
} finally {
@@ -6904,7 +6900,7 @@
if (mRootWindowContainer.finishDisabledPackageActivities(
packageName, disabledClasses, true, false, userId) && booted) {
mRootWindowContainer.resumeFocusedStacksTopActivities();
- mStackSupervisor.scheduleIdleLocked();
+ mStackSupervisor.scheduleIdle();
}
// Clean-up disabled tasks
@@ -6931,7 +6927,7 @@
synchronized (mGlobalLock) {
mRootWindowContainer.resumeFocusedStacksTopActivities();
if (scheduleIdle) {
- mStackSupervisor.scheduleIdleLocked();
+ mStackSupervisor.scheduleIdle();
}
}
}