Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new capability name." am: 381eb7a9c9 am: 8ac87777ba

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455205

Change-Id: Ib13f90af1d91bef0dcdf58a2ef9c9229e0d528f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-23 23:23:17 +00:00
committed by Automerger Merge Worker
parent ba2cbd95f0 8ac87777ba
commit 4c021029dd
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/test-current.txt
View File

@@ -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_CAMERA = 2; // 0x2
field public static final int PROCESS_CAPABILITY_FOREGROUND_LOCATION = 1; // 0x1 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_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_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_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

12
core/java/android/app/ActivityManager.java
View File

@@ -643,9 +643,17 @@ public class ActivityManager {
@TestApi @TestApi
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;
/** @hide all capabilities, the ORing of all flags in {@link ProcessCapability}*/ /** @hide all capabilities, the ORing of all flags in {@link ProcessCapability}*/
@TestApi @TestApi