Move ProcessStateRecord to psc package
The `ProcessStateRecord` class has been moved from the package
`com.android.server.am` to `com.android.server.am.psc` to improve code
organization.
This involved updating imports and references across affected files.
Method visibilities and synchronization annotations were adjusted as
needed.
Bug: 425766486
Test: mmm frameworks/base/services/
Test: atest MockingOomAdjusterTests
Flag: EXEMPT pure refactor
Change-Id: I2bfb5bd584358add21eaef798e36b3552d0ea182
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 9e75ace..882882c 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -245,6 +245,7 @@
import com.android.server.am.LowMemDetector.MemFactor;
import com.android.server.am.ServiceRecord.ShortFgsInfo;
import com.android.server.am.ServiceRecord.TimeLimitedFgsInfo;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.pm.KnownPackages;
import com.android.server.uri.NeededUriGrants;
import com.android.server.utils.AnrTimer;
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2e5213e..648c561 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -455,6 +455,7 @@
import com.android.server.UiThread;
import com.android.server.Watchdog;
import com.android.server.am.LowMemDetector.MemFactor;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.appop.AppOpsService;
import com.android.server.compat.PlatformCompat;
import com.android.server.contentcapture.ContentCaptureManagerInternal;
diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java
index 15c1c8f..4aef2f8 100644
--- a/services/core/java/com/android/server/am/AppProfiler.java
+++ b/services/core/java/com/android/server/am/AppProfiler.java
@@ -101,6 +101,7 @@
import com.android.internal.util.MemInfoReader;
import com.android.internal.util.QuickSelect;
import com.android.server.am.LowMemDetector.MemFactor;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.power.stats.BatteryStatsImpl;
import com.android.server.utils.PriorityDump;
diff --git a/services/core/java/com/android/server/am/BroadcastProcessQueue.java b/services/core/java/com/android/server/am/BroadcastProcessQueue.java
index a5e191c..a50993d7 100644
--- a/services/core/java/com/android/server/am/BroadcastProcessQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastProcessQueue.java
@@ -38,6 +38,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.SomeArgs;
+import com.android.server.am.psc.ProcessStateRecord;
import dalvik.annotation.optimization.NeverCompile;
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 89e922e..41f8f14 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -148,6 +148,7 @@
import com.android.server.ServiceThread;
import com.android.server.am.psc.PlatformCompatCache;
import com.android.server.am.psc.PlatformCompatCache.CachedCompatChangeId;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.wm.WindowProcessController;
import java.io.PrintWriter;
diff --git a/services/core/java/com/android/server/am/OomAdjusterImpl.java b/services/core/java/com/android/server/am/OomAdjusterImpl.java
index 9dd46a1..cc44e5e 100644
--- a/services/core/java/com/android/server/am/OomAdjusterImpl.java
+++ b/services/core/java/com/android/server/am/OomAdjusterImpl.java
@@ -104,6 +104,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.ServiceThread;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.wm.ActivityServiceConnectionsHolder;
import java.lang.annotation.Retention;
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 31c1ba4..bf6e6a0 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -147,6 +147,7 @@
import com.android.server.Watchdog;
import com.android.server.am.ActivityManagerService.ProcessChangeItem;
import com.android.server.am.psc.PlatformCompatCache;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.compat.PlatformCompat;
import com.android.server.pm.pkg.AndroidPackage;
import com.android.server.pm.pkg.PackageStateInternal;
@@ -301,7 +302,7 @@
// Activity manager's version of an undefined schedule group
static final int SCHED_GROUP_UNDEFINED = Integer.MIN_VALUE;
// Activity manager's version of Process.THREAD_GROUP_BACKGROUND
- static final int SCHED_GROUP_BACKGROUND = 0;
+ public static final int SCHED_GROUP_BACKGROUND = 0;
// Activity manager's version of Process.THREAD_GROUP_RESTRICTED
static final int SCHED_GROUP_RESTRICTED = 1;
// Activity manager's version of Process.THREAD_GROUP_DEFAULT
diff --git a/services/core/java/com/android/server/am/ProcessProfileRecord.java b/services/core/java/com/android/server/am/ProcessProfileRecord.java
index eb116be..4b4d9cc 100644
--- a/services/core/java/com/android/server/am/ProcessProfileRecord.java
+++ b/services/core/java/com/android/server/am/ProcessProfileRecord.java
@@ -36,6 +36,7 @@
import com.android.internal.app.procstats.ProcessState;
import com.android.internal.app.procstats.ProcessStats;
import com.android.server.am.ProcessList.ProcStateMemTracker;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.power.stats.BatteryStatsImpl;
import java.io.PrintWriter;
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index fd80bca..2d62f0a 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -68,6 +68,7 @@
import com.android.server.FgThread;
import com.android.server.am.OomAdjusterImpl.ProcessRecordNode;
import com.android.server.am.psc.PlatformCompatCache.CachedCompatChangeId;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.wm.WindowProcessController;
import com.android.server.wm.WindowProcessListener;
diff --git a/services/core/java/com/android/server/am/ProcessStateRecord.java b/services/core/java/com/android/server/am/psc/ProcessStateRecord.java
similarity index 99%
rename from services/core/java/com/android/server/am/ProcessStateRecord.java
rename to services/core/java/com/android/server/am/psc/ProcessStateRecord.java
index e32d242..b30f22f 100644
--- a/services/core/java/com/android/server/am/ProcessStateRecord.java
+++ b/services/core/java/com/android/server/am/psc/ProcessStateRecord.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.am;
+package com.android.server.am.psc;
import static android.app.ActivityManager.PROCESS_CAPABILITY_NONE;
import static android.app.ActivityManager.PROCESS_STATE_CACHED_EMPTY;
@@ -36,6 +36,7 @@
import com.android.internal.annotations.CompositeRWLock;
import com.android.internal.annotations.GuardedBy;
+import com.android.server.am.Flags;
import com.android.server.am.psc.PlatformCompatCache.CachedCompatChangeId;
import java.io.PrintWriter;
diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index d1bb41d..cd011c2 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -91,7 +91,7 @@
import com.android.server.Watchdog;
import com.android.server.am.Flags;
import com.android.server.am.ProcessStateController;
-import com.android.server.am.ProcessStateRecord;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.art.ReasonMapping;
import com.android.server.grammaticalinflection.GrammaticalInflectionManagerInternal;
import com.android.server.wm.ActivityTaskManagerService.HotPath;
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
index 6291ffa..10eeab2 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
@@ -127,6 +127,7 @@
import android.util.SparseIntArray;
import com.android.server.LocalServices;
+import com.android.server.am.psc.ProcessStateRecord;
import com.android.server.wm.ActivityServiceConnectionsHolder;
import com.android.server.wm.ActivityTaskManagerService;
import com.android.server.wm.WindowProcessController;
