From 95702cb4b6fe9d22f00f9f5603c23ab6349400b1 Mon Sep 17 00:00:00 2001 From: Jay Thomas Sullivan Date: Wed, 9 Nov 2022 16:48:14 -0800 Subject: [PATCH] Make process capability constants systemapi These constants will need to be used by the Unified Permission Subsystem. Bug: 182523293 Test: presubmit Change-Id: I9e366408851b310ada5c2b763788584ed223594c --- core/api/system-current.txt | 4 ++++ core/api/test-current.txt | 4 ---- core/java/android/app/ActivityManager.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 92d507a0e3a21..dfc3c0d7e1534 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -512,6 +512,10 @@ package android.app { method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public boolean startProfile(@NonNull android.os.UserHandle); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public boolean stopProfile(@NonNull android.os.UserHandle); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean switchUser(@NonNull android.os.UserHandle); + 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_NONE = 0; // 0x0 } public static interface ActivityManager.OnUidImportanceListener { diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 3fee610943ba8..e4dac45157935 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -143,11 +143,7 @@ package android.app { field public static final int PROCESS_CAPABILITY_ALL = 15; // 0xf field public static final int PROCESS_CAPABILITY_ALL_EXPLICIT = 1; // 0x1 field public static final int PROCESS_CAPABILITY_ALL_IMPLICIT = 6; // 0x6 - 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 public static final int PROCESS_CAPABILITY_NONE = 0; // 0x0 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 diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index d6c10ae264066..b8703eb5bad5b 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -628,19 +628,19 @@ public class ActivityManager { public @interface ProcessCapability {} /** @hide Process does not have any capability */ - @TestApi + @SystemApi public static final int PROCESS_CAPABILITY_NONE = 0; /** @hide Process can access location while in foreground */ - @TestApi + @SystemApi public static final int PROCESS_CAPABILITY_FOREGROUND_LOCATION = 1 << 0; /** @hide Process can access camera while in foreground */ - @TestApi + @SystemApi public static final int PROCESS_CAPABILITY_FOREGROUND_CAMERA = 1 << 1; /** @hide Process can access microphone while in foreground */ - @TestApi + @SystemApi public static final int PROCESS_CAPABILITY_FOREGROUND_MICROPHONE = 1 << 2; /** @hide Process can access network despite any power saving resrictions */