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

Commit 70cd9f8c authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Foreground audio control capability uses roForegroundAudioControl flag 

Switch from "old" flag to new RO flag.

Bug: 316414750
Test: build
Change-Id: I725a8cb3ce0d4f574990772e4f88bcc619c8431c
parent da767359

core/java/android/app/AppOpsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.app; 




import static android.location.flags.Flags.FLAG_LOCATION_BYPASS;

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

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

import static android.permission.flags.Flags.FLAG_OP_ENABLE_MOBILE_DATA_BY_USER;

import static android.view.contentprotection.flags.Flags.FLAG_CREATE_ACCESSIBILITY_OVERLAY_APP_OP_ENABLED;

import static android.view.contentprotection.flags.Flags.FLAG_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER_APP_OP_ENABLED;
@@ -3246,7 +3246,7 @@ public class AppOpsManager { 
     * @hide

     */

    public static @Mode int opToDefaultMode(int op) {

        if (op == OP_TAKE_AUDIO_FOCUS && foregroundAudioControl()) {

        if (op == OP_TAKE_AUDIO_FOCUS && roForegroundAudioControl()) {

            // when removing the flag, change the entry in sAppOpInfos for OP_TAKE_AUDIO_FOCUS

            return AppOpsManager.MODE_FOREGROUND;

        }

services/core/java/com/android/server/am/OomAdjuster.java

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; 
import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK;

import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE;

import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL;

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

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

import static android.os.Process.SCHED_OTHER;

import static android.os.Process.THREAD_GROUP_BACKGROUND;

import static android.os.Process.THREAD_GROUP_DEFAULT;
@@ -2212,7 +2212,7 @@ public class OomAdjuster { 
                            (fgsType & FOREGROUND_SERVICE_TYPE_LOCATION)

                                    != 0 ? PROCESS_CAPABILITY_FOREGROUND_LOCATION : 0;



                    if (foregroundAudioControl()) { // flag check

                    if (roForegroundAudioControl()) { // flag check

                        final int fgsAudioType = FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK

                                | FOREGROUND_SERVICE_TYPE_CAMERA

                                | FOREGROUND_SERVICE_TYPE_MICROPHONE

services/core/java/com/android/server/audio/AudioService.java

+4 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import static android.media.audio.Flags.autoPublicVolumeApiHardening; 
import static android.media.audio.Flags.automaticBtDeviceType;

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

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

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

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

import static android.media.audiopolicy.Flags.enableFadeManagerConfiguration;

import static android.os.Process.FIRST_APPLICATION_UID;

import static android.os.Process.INVALID_UID;
@@ -4539,10 +4539,11 @@ public class AudioService extends IAudioService.Stub 
                + focusFreezeTestApi());

        pw.println("\tcom.android.media.audio.disablePrescaleAbsoluteVolume:"

                + disablePrescaleAbsoluteVolume());















        pw.println("\tcom.android.media.audio.setStreamVolumeOrder:"















                + setStreamVolumeOrder());













        pw.println("\tandroid.media.audio.foregroundAudioControl:"













                + foregroundAudioControl());













        pw.println("\tandroid.media.audio.roForegroundAudioControl:"













                + roForegroundAudioControl());















    }





























    private void dumpAudioMode(PrintWriter pw) {