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

Commit 778cbd12 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Remove PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL from sys API" into main

parents f7f74bc5 45d469e9

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -598,7 +598,6 @@ package android.app { 
    field public static final int FOREGROUND_SERVICE_API_TYPE_MICROPHONE = 6; // 0x6

    field public static final int FOREGROUND_SERVICE_API_TYPE_PHONE_CALL = 7; // 0x7

    field public static final int FOREGROUND_SERVICE_API_TYPE_USB = 8; // 0x8

    field @FlaggedApi("android.media.audio.foreground_audio_control") public static final int PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL = 64; // 0x40

    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

core/java/android/app/ActivityManager.java

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.WindowConfiguration.activityTypeToString; 
import static android.app.WindowConfiguration.windowingModeToString;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;

import static android.media.audio.Flags.FLAG_FOREGROUND_AUDIO_CONTROL;



import android.Manifest;

import android.annotation.ColorInt;
@@ -948,8 +947,6 @@ public class ActivityManager { 
     * @hide

     * Process can access volume APIs and can request audio focus with GAIN.

     */

    @FlaggedApi(FLAG_FOREGROUND_AUDIO_CONTROL)

    @SystemApi

    public static final int PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL = 1 << 6;



    /**