Removed references to ATMS.mHomeProcess and mPreviousProcess from AMS (33/n)
Should only be access from ATMS side.
Bug: 80414790
Test: Existing tests pass
Change-Id: I726037d5a5fba9295ddeffb4c02637c287bf6da8
diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
index 0c8716c..c89c8db 100644
--- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
@@ -5904,6 +5904,7 @@
mShuttingDown = true;
mStackSupervisor.prepareForShutdownLocked();
updateEventDispatchingLocked(booted);
+ notifyTaskPersisterLocked(null, true);
return mStackSupervisor.shutdownLocked(timeout);
}
}
@@ -6584,6 +6585,17 @@
}
@Override
+ public void dumpForOom(PrintWriter pw) {
+ synchronized (mGlobalLock) {
+ pw.println(" mHomeProcess: " + mHomeProcess);
+ pw.println(" mPreviousProcess: " + mPreviousProcess);
+ if (mHeavyWeightProcess != null) {
+ pw.println(" mHeavyWeightProcess: " + mHeavyWeightProcess);
+ }
+ }
+ }
+
+ @Override
public boolean canGcNow() {
synchronized (mGlobalLock) {
return isSleeping() || mStackSupervisor.allResumedActivitiesIdle();
@@ -6741,5 +6753,19 @@
public void flushRecentTasks() {
mRecentTasks.flush();
}
+
+ @Override
+ public WindowProcessController getHomeProcess() {
+ synchronized (mGlobalLock) {
+ return mHomeProcess;
+ }
+ }
+
+ @Override
+ public WindowProcessController getPreviousProcess() {
+ synchronized (mGlobalLock) {
+ return mPreviousProcess;
+ }
+ }
}
}