Merge "Add new capability name." into udc-dev
This commit is contained in:
@@ -145,7 +145,8 @@ package android.app {
|
|||||||
method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();
|
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 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_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_FOREGROUND_SERVICE = 4; // 0x4
|
||||||
field public static final int PROCESS_STATE_TOP = 2; // 0x2
|
field public static final int PROCESS_STATE_TOP = 2; // 0x2
|
||||||
field public static final int STOP_USER_ON_SWITCH_DEFAULT = -1; // 0xffffffff
|
field public static final int STOP_USER_ON_SWITCH_DEFAULT = -1; // 0xffffffff
|
||||||
|
|||||||
@@ -751,9 +751,17 @@ public class ActivityManager {
|
|||||||
@SystemApi
|
@SystemApi
|
||||||
public static final int PROCESS_CAPABILITY_FOREGROUND_MICROPHONE = 1 << 2;
|
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
|
@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
|
* Flag used to indicate whether an app is allowed to start a foreground service from the
|
||||||
|
|||||||
Reference in New Issue
Block a user