From 4d9cc95b5255fa8b24c7d90cdfb5ee2b2a016dea Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Fri, 5 Mar 2021 09:04:49 +0000
Subject: [PATCH] Remove network capability from CAPABILITY_ALL constant.

We shouldn't include it until we also update OomAdjuster
to add it to certain processes.

Fixes: 181902246
Test: atest ./tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
Change-Id: I3bfdd2b01c3ba8010e96177e41fc90be3dce8a55
Merged-In: I888764ff22fba92fe2cccf3d8442ed318a19ad2a
---
 core/api/test-current.txt                  | 2 +-
 core/java/android/app/ActivityManager.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index c8ed6261f51aa..68721418b4072 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -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
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index fcced049f20ef..551f1e6609484 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -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.