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

Commit 45081ab6 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge changes from topics "b124224342", "change_procstate_flag" into tm-dev 

* changes:
  Add new onUidProcAdjChanged callback to be consumed by the camera service.
  Modify UidRecord.CHANGE_PROCSTATE such that it behaves like a bit mask.
parents c4b98636 db9165ba

apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -767,6 +767,10 @@ public class AppStateTrackerImpl implements AppStateTracker { 
        @Override

        public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override

        public void onUidProcAdjChanged(int uid) {

        }

    }



    private final class AppOpsWatcher extends IAppOpsCallback.Stub {

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+3 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,9 @@ public class JobSchedulerService extends com.android.server.SystemService 


        @Override public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override public void onUidProcAdjChanged(int uid) {

        }

    };



    public Context getTestableContext() {

apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java

+4 −0
Original line number Diff line number Diff line
@@ -404,6 +404,10 @@ public final class QuotaController extends StateController { 
        @Override

        public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override

        public void onUidProcAdjChanged(int uid) {

        }

    }



    /**

apex/jobscheduler/service/java/com/android/server/tare/ProcessStateModifier.java

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ class ProcessStateModifier extends Modifier { 
        @Override

        public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override

        public void onUidProcAdjChanged(int uid) {

        }

    };



    ProcessStateModifier(@NonNull InternalResourceService irs) {

core/java/android/app/ActivityManager.java

+6 −0
Original line number Diff line number Diff line
@@ -222,6 +222,9 @@ public class ActivityManager { 


        @Override public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override public void onUidProcAdjChanged(int uid) {

        }

    }



    final ArrayMap<OnUidImportanceListener, UidObserver> mImportanceListeners = new ArrayMap<>();
@@ -825,6 +828,9 @@ public class ActivityManager { 
    /** @hide Flag for registerUidObserver: report uid capability has changed. */

    public static final int UID_OBSERVER_CAPABILITY = 1<<5;



    /** @hide Flag for registerUidObserver: report pid oom adj has changed. */

    public static final int UID_OBSERVER_PROC_OOM_ADJ = 1 << 6;



    /** @hide Mode for {@link IActivityManager#isAppStartModeDisabled}: normal free-to-run operation. */

    public static final int APP_START_MODE_NORMAL = 0;