Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bae26c24 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7fda879db6352d7043ae09da147b4a92ac710a8
parents b6625e59 9ffb8a6b

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/app/ActivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -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.