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

Merge "Remove network capability from CAPABILITY_ALL constant." am: 9ffb8a6bc6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7fda879db6352d7043ae09da147b4a92ac710a8
This commit is contained in:
Sudheer Shanka
2021-03-05 23:49:49 +00:00
committed by Automerger Merge Worker
parent b6625e5976 9ffb8a6bc6
commit bae26c2434
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ package android.app {
method public static boolean isHighEndGfx();
method public static void resumeAppSwitches() throws android.os.RemoteException;
method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);
field public static final int PROCESS_CAPABILITY_ALL = 15; // 0xf
field public static final int PROCESS_CAPABILITY_ALL = 7; // 0x7
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

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

@@ -608,8 +608,7 @@ public class ActivityManager {
@TestApi
public static final int PROCESS_CAPABILITY_ALL = PROCESS_CAPABILITY_FOREGROUND_LOCATION
| PROCESS_CAPABILITY_FOREGROUND_CAMERA
| PROCESS_CAPABILITY_FOREGROUND_MICROPHONE
| PROCESS_CAPABILITY_NETWORK;
| PROCESS_CAPABILITY_FOREGROUND_MICROPHONE;
/**
* All explicit capabilities. These are capabilities that need to be specified from manifest
* file.