Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4827dd4b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ib300a16a,I9ac99857,I0114a499,I2bfb5bd5 into main 

* changes:
  Remove unused ProcessStateRecord#mHasProcStateChanged field
  am: Extract UID process state into UidStateRecord
  am: Remove unused UidRecord fields
  Move ProcessStateRecord to psc package
parents 3c413de9 c7755236

core/proto/android/server/activitymanagerservice.proto

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ message UidRecordProto { 
        CHANGE_PROCADJ = 7;

    }

    repeated Change last_reported_changes = 8;

    optional int32 num_procs = 9;

    optional int32 num_procs = 9 [deprecated=true];



    message ProcStateSequence {

        option (.android.msg_privacy).dest = DEST_AUTOMATIC;

services/core/java/com/android/server/am/ActiveServices.java

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ import com.android.server.am.ActivityManagerService.ItemMatcher; 
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;

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ import com.android.server.ThreadPriorityBooster; 
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;

services/core/java/com/android/server/am/AppProfiler.java

+1 −3
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ import com.android.internal.util.FrameworkStatsLog; 
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;
@@ -1402,9 +1403,6 @@ public class AppProfiler { 
                    final ProcessProfileRecord profile = app.mProfile;

                    final IApplicationThread thread;

                    final ProcessStateRecord state = app.mState;

                    if (state.getHasProcStateChanged()) {

                        state.setHasProcStateChanged(false);

                    }

                    int procState = app.mState.getCurProcState();

                    if (((procState >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND

                                            && procState

services/core/java/com/android/server/am/BroadcastProcessQueue.java

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.util.TimeUtils; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.SomeArgs;

import com.android.server.am.psc.ProcessStateRecord;



import dalvik.annotation.optimization.NeverCompile;