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

Commit 55b16773 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Add new capability name." into udc-dev am: f19df858 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21587419



Change-Id: Iaa024785f379fd12da34886101bde0c539fe32da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2ceb668 f19df858

core/api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();

    field public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; // 0xa692aadL

    field public static final int PROCESS_CAPABILITY_ALL_IMPLICIT = 6; // 0x6

    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_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
@@ -751,9 +751,17 @@ public class ActivityManager { 
    @SystemApi

    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;



    /**

     * Flag used to indicate whether an app is allowed to start a foreground service from the