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

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

Merge "PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL for all FGS types" into main

parents aef5e0e1 f6755cd5

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

+9 −6
Original line number Diff line number Diff line
@@ -2205,12 +2205,15 @@ public class OomAdjuster { 
                                    != 0 ? PROCESS_CAPABILITY_FOREGROUND_LOCATION : 0;



                    if (roForegroundAudioControl()) { // flag check

                        final int fgsAudioType = FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK

                                | FOREGROUND_SERVICE_TYPE_CAMERA

                                | FOREGROUND_SERVICE_TYPE_MICROPHONE

                                | FOREGROUND_SERVICE_TYPE_PHONE_CALL;

                        capabilityFromFGS |= (psr.getForegroundServiceTypes() & fgsAudioType) != 0

                                ? PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL : 0;

                        // TODO revisit restriction of FOREGROUND_AUDIO_CONTROL when it can be

                        //      limited to specific FGS types

                        //final int fgsAudioType = FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK

                        //        | FOREGROUND_SERVICE_TYPE_CAMERA

                        //        | FOREGROUND_SERVICE_TYPE_MICROPHONE

                        //        | FOREGROUND_SERVICE_TYPE_PHONE_CALL;

                        //capabilityFromFGS |= (psr.getForegroundServiceTypes() & fgsAudioType) != 0

                        //        ? PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL : 0;

                        capabilityFromFGS |= PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL;

                    }



                    final boolean enabled = state.getCachedCompatChange(