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

Commit 22198659 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add new capability name." into tm-mainline-prod

parents 7451cc6f b5095b2b

core/api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -141,8 +141,9 @@ package android.app { 
    field public static final int PROCESS_CAPABILITY_FOREGROUND_CAMERA = 2; // 0x2

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

    field public static final int PROCESS_CAPABILITY_FOREGROUND_MICROPHONE = 4; // 0x4

    field public static final int PROCESS_CAPABILITY_NETWORK = 8; // 0x8

    field @Deprecated public static final int PROCESS_CAPABILITY_NETWORK = 8; // 0x8

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

    field public static final int PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK = 8; // 0x8

    field public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; // 0x4

    field public static final int PROCESS_STATE_TOP = 2; // 0x2

    field public static final int STOP_USER_ON_SWITCH_DEFAULT = -1; // 0xffffffff

core/java/android/app/ActivityManager.java

+10 −2
Original line number Diff line number Diff line
@@ -642,9 +642,17 @@ public class ActivityManager { 
    @TestApi

    public static final int PROCESS_CAPABILITY_FOREGROUND_MICROPHONE = 1 << 2;



    /** @hide Process can access network despite any power saving resrictions */

    /** @hide Process can access network despite any power saving restrictions */

    @TestApi

    public static final int PROCESS_CAPABILITY_NETWORK = 1 << 3;

    public static final int PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK = 1 << 3;

    /**

     * @hide

     * @deprecated Use {@link #PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK} instead.

     */

    @TestApi

    @Deprecated

    public static final int PROCESS_CAPABILITY_NETWORK =

            PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK;



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

    @TestApi