commit ee4668c5a56e4dbf0ee88e80ffbd51abed68fdeb
author Daniel Bright <dbright@google.com> Fri Mar 05 23:42:05 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 05 23:42:05 2021 +0000
tree 03dc045b7f5af9bb03f08903af801df24b0514f3
parent 9ffb8a6bc624171b70f21383606b55f8ffdf819b
parent e69ec553b422374b3b6240be467e96cd456cf84b

Merge "Hide start and cancel handover from api surface"

core/api/test-current.txt

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index c8ed626..6872141 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -82,7 +82,7 @@
     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

core/java/android/app/ActivityManager.java

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index fcced04..551f1e6 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -608,8 +608,7 @@
     @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.