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

Commit a86a36b1 authored by Hui Yu's avatar Hui Yu Committed by Android (Google) Code Review
Browse files

Merge "Add process capability as a new dimension."

parents 192f7350 26969321

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

+2 −1
Original line number Diff line number Diff line
@@ -899,7 +899,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
    }



    final private IUidObserver mUidObserver = new IUidObserver.Stub() {

        @Override public void onUidStateChanged(int uid, int procState, long procStateSeq) {

        @Override public void onUidStateChanged(int uid, int procState, long procStateSeq,

                int capability) {

            mHandler.obtainMessage(MSG_UID_STATE_CHANGED, uid, procState).sendToTarget();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ public final class QuotaController extends StateController { 


    private final IUidObserver mUidObserver = new IUidObserver.Stub() {

        @Override

        public void onUidStateChanged(int uid, int procState, long procStateSeq) {

        public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) {

            mHandler.obtainMessage(MSG_UID_PROCESS_STATE_CHANGED, uid, procState).sendToTarget();

        }

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ package android.app { 
    field public static final int UID_STATE_CACHED = 700; // 0x2bc

    field public static final int UID_STATE_FOREGROUND = 500; // 0x1f4

    field public static final int UID_STATE_FOREGROUND_SERVICE = 400; // 0x190

    field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c

    field @Deprecated public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c

    field public static final int UID_STATE_PERSISTENT = 100; // 0x64

    field public static final int UID_STATE_TOP = 200; // 0xc8

  }

api/test-current.txt

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);

    method public static void resumeAppSwitches() throws android.os.RemoteException;

    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);

    field public static final int PROCESS_CAPABILITY_ALL = 1; // 0x1

    field public static final int PROCESS_CAPABILITY_FOREGROUND_LOCATION = 1; // 0x1

    field public static final int PROCESS_CAPABILITY_NONE = 0; // 0x0

  }



  public static interface ActivityManager.OnUidImportanceListener {
@@ -233,7 +236,7 @@ package android.app { 
    field public static final int UID_STATE_CACHED = 700; // 0x2bc

    field public static final int UID_STATE_FOREGROUND = 500; // 0x1f4

    field public static final int UID_STATE_FOREGROUND_SERVICE = 400; // 0x190

    field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c

    field @Deprecated public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c

    field public static final int UID_STATE_PERSISTENT = 100; // 0x64

    field public static final int UID_STATE_TOP = 200; // 0xc8

  }
@@ -2422,6 +2425,7 @@ package android.provider { 
  }



  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

    field public static final String APP_OPS_CONSTANTS = "app_ops_constants";

    field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";

    field public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode";

    field public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants";

core/java/android/app/ActivityManager.java

+71 −27
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class ActivityManager { 
        }



        @Override

        public void onUidStateChanged(int uid, int procState, long procStateSeq) {

        public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) {

            mListener.onUidImportance(uid, RunningAppProcessInfo.procStateToImportanceForClient(

                    procState, mContext));

        }
@@ -432,7 +432,6 @@ public class ActivityManager { 
    public static final int USER_OP_ERROR_RELATED_USERS_CANNOT_STOP = -4;



    /**

     * @hide

     * Process states, describing the kind of state a particular process is in.

     * When updating these, make sure to also check all related references to the

     * constant in code, and update these arrays:
@@ -443,7 +442,34 @@ public class ActivityManager { 
     * @see com.android.server.am.ProcessList#sSameAwakePssTimes

     * @see com.android.server.am.ProcessList#sTestFirstPssTimes

     * @see com.android.server.am.ProcessList#sTestSamePssTimes

     * @hide

     */

    @IntDef(flag = false, prefix = { "PROCESS_STATE_" }, value = {

        PROCESS_STATE_UNKNOWN, // -1

        PROCESS_STATE_PERSISTENT, // 0

        PROCESS_STATE_PERSISTENT_UI,

        PROCESS_STATE_TOP,

        PROCESS_STATE_BOUND_TOP,

        PROCESS_STATE_FOREGROUND_SERVICE,

        PROCESS_STATE_BOUND_FOREGROUND_SERVICE,

        PROCESS_STATE_IMPORTANT_FOREGROUND,

        PROCESS_STATE_IMPORTANT_BACKGROUND,

        PROCESS_STATE_TRANSIENT_BACKGROUND,

        PROCESS_STATE_BACKUP,

        PROCESS_STATE_SERVICE,

        PROCESS_STATE_RECEIVER,

        PROCESS_STATE_TOP_SLEEPING,

        PROCESS_STATE_HEAVY_WEIGHT,

        PROCESS_STATE_HOME,

        PROCESS_STATE_LAST_ACTIVITY,

        PROCESS_STATE_CACHED_ACTIVITY,

        PROCESS_STATE_CACHED_ACTIVITY_CLIENT,

        PROCESS_STATE_CACHED_RECENT,

        PROCESS_STATE_CACHED_EMPTY,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ProcessState {}





    /** @hide Not a real process state. */

    public static final int PROCESS_STATE_UNKNOWN = -1;
@@ -459,78 +485,98 @@ public class ActivityManager { 
    @UnsupportedAppUsage

    public static final int PROCESS_STATE_TOP = 2;



    /** @hide Process is hosting a foreground service with location type. */

    public static final int PROCESS_STATE_FOREGROUND_SERVICE_LOCATION = 3;



    /** @hide Process is bound to a TOP app. This is ranked below SERVICE_LOCATION so that

     * it doesn't get the capability of location access while-in-use. */

    public static final int PROCESS_STATE_BOUND_TOP = 4;

    public static final int PROCESS_STATE_BOUND_TOP = 3;



    /** @hide Process is hosting a foreground service. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_FOREGROUND_SERVICE = 5;

    public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4;



    /** @hide Process is hosting a foreground service due to a system binding. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 6;

    public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 5;



    /** @hide Process is important to the user, and something they are aware of. */

    public static final int PROCESS_STATE_IMPORTANT_FOREGROUND = 7;

    public static final int PROCESS_STATE_IMPORTANT_FOREGROUND = 6;



    /** @hide Process is important to the user, but not something they are aware of. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_IMPORTANT_BACKGROUND = 8;

    public static final int PROCESS_STATE_IMPORTANT_BACKGROUND = 7;



    /** @hide Process is in the background transient so we will try to keep running. */

    public static final int PROCESS_STATE_TRANSIENT_BACKGROUND = 9;

    public static final int PROCESS_STATE_TRANSIENT_BACKGROUND = 8;



    /** @hide Process is in the background running a backup/restore operation. */

    public static final int PROCESS_STATE_BACKUP = 10;

    public static final int PROCESS_STATE_BACKUP = 9;



    /** @hide Process is in the background running a service.  Unlike oom_adj, this level

     * is used for both the normal running in background state and the executing

     * operations state. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_SERVICE = 11;

    public static final int PROCESS_STATE_SERVICE = 10;



    /** @hide Process is in the background running a receiver.   Note that from the

     * perspective of oom_adj, receivers run at a higher foreground level, but for our

     * prioritization here that is not necessary and putting them below services means

     * many fewer changes in some process states as they receive broadcasts. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_RECEIVER = 12;

    public static final int PROCESS_STATE_RECEIVER = 11;



    /** @hide Same as {@link #PROCESS_STATE_TOP} but while device is sleeping. */

    public static final int PROCESS_STATE_TOP_SLEEPING = 13;

    public static final int PROCESS_STATE_TOP_SLEEPING = 12;



    /** @hide Process is in the background, but it can't restore its state so we want

     * to try to avoid killing it. */

    public static final int PROCESS_STATE_HEAVY_WEIGHT = 14;

    public static final int PROCESS_STATE_HEAVY_WEIGHT = 13;



    /** @hide Process is in the background but hosts the home activity. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_HOME = 15;

    public static final int PROCESS_STATE_HOME = 14;



    /** @hide Process is in the background but hosts the last shown activity. */

    public static final int PROCESS_STATE_LAST_ACTIVITY = 16;

    public static final int PROCESS_STATE_LAST_ACTIVITY = 15;



    /** @hide Process is being cached for later use and contains activities. */

    @UnsupportedAppUsage

    public static final int PROCESS_STATE_CACHED_ACTIVITY = 17;

    public static final int PROCESS_STATE_CACHED_ACTIVITY = 16;



    /** @hide Process is being cached for later use and is a client of another cached

     * process that contains activities. */

    public static final int PROCESS_STATE_CACHED_ACTIVITY_CLIENT = 18;

    public static final int PROCESS_STATE_CACHED_ACTIVITY_CLIENT = 17;



    /** @hide Process is being cached for later use and has an activity that corresponds

     * to an existing recent task. */

    public static final int PROCESS_STATE_CACHED_RECENT = 19;

    public static final int PROCESS_STATE_CACHED_RECENT = 18;



    /** @hide Process is being cached for later use and is empty. */

    public static final int PROCESS_STATE_CACHED_EMPTY = 20;

    public static final int PROCESS_STATE_CACHED_EMPTY = 19;



    /** @hide Process does not exist. */

    public static final int PROCESS_STATE_NONEXISTENT = 21;

    public static final int PROCESS_STATE_NONEXISTENT = 20;



    /**

     * The set of flags for process capability.

     * @hide

     */

    @IntDef(flag = true, prefix = { "PROCESS_CAPABILITY_" }, value = {

            PROCESS_CAPABILITY_NONE,

            PROCESS_CAPABILITY_FOREGROUND_LOCATION,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ProcessCapability {}



    /** @hide Process does not have any capability */

    @TestApi

    public static final int PROCESS_CAPABILITY_NONE = 0;



    /** @hide Process can access location while in foreground */

    @TestApi

    public static final int PROCESS_CAPABILITY_FOREGROUND_LOCATION = 1 << 0;



    /** @hide all capabilities, the ORing of all flags in {@link ProcessCapability}*/

    @TestApi

    public static final int PROCESS_CAPABILITY_ALL = PROCESS_CAPABILITY_FOREGROUND_LOCATION;



    // NOTE: If PROCESS_STATEs are added, then new fields must be added

    // to frameworks/base/core/proto/android/app/enums.proto and the following method must
@@ -557,7 +603,6 @@ public class ActivityManager { 
                return AppProtoEnums.PROCESS_STATE_TOP;

            case PROCESS_STATE_BOUND_TOP:

                return AppProtoEnums.PROCESS_STATE_BOUND_TOP;

            case PROCESS_STATE_FOREGROUND_SERVICE_LOCATION:

            case PROCESS_STATE_FOREGROUND_SERVICE:

                return AppProtoEnums.PROCESS_STATE_FOREGROUND_SERVICE;

            case PROCESS_STATE_BOUND_FOREGROUND_SERVICE:
@@ -612,8 +657,7 @@ public class ActivityManager { 


    /** @hide Is this a foreground service type? */

    public static boolean isForegroundService(int procState) {

        return procState == PROCESS_STATE_FOREGROUND_SERVICE_LOCATION

                || procState == PROCESS_STATE_FOREGROUND_SERVICE;

        return procState == PROCESS_STATE_FOREGROUND_SERVICE;

    }



    /** @hide requestType for assist context: only basic information. */
@@ -2930,7 +2974,7 @@ public class ActivityManager { 
                return IMPORTANCE_PERCEPTIBLE;

            } else if (procState >= PROCESS_STATE_IMPORTANT_FOREGROUND) {

                return IMPORTANCE_VISIBLE;

            } else if (procState >= PROCESS_STATE_FOREGROUND_SERVICE_LOCATION) {

            } else if (procState >= PROCESS_STATE_FOREGROUND_SERVICE) {

                return IMPORTANCE_FOREGROUND_SERVICE;

            } else {

                return IMPORTANCE_FOREGROUND;