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

Commit a36cf269 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: retrieve AIDL audio hal pids" into main am: 3d5cb30a am: 86cdd111 am: d9cbd9d3 

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



Change-Id: I7688d52c8b82b53beb5c44fee91257c209c2e00c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 730d49c0 d9cbd9d3

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

+24 −4
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ import android.os.Process; 
import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceDebugInfo;

import android.os.ServiceManager;

import android.os.ShellCallback;

import android.os.SystemClock;
@@ -12881,12 +12882,25 @@ public class AudioService extends IAudioService.Stub 














    private static final String AUDIO_HAL_SERVICE_PREFIX = "android.hardware.audio";



























    private Set<Integer> getAudioHalPids() {













    private void getAudioAidlHalPids(HashSet<Integer> pids) {













        try {













            ServiceDebugInfo[] infos = ServiceManager.getServiceDebugInfo();













            if (infos == null) return;













            for (ServiceDebugInfo info : infos) {













                if (info.debugPid > 0 && info.name.startsWith(AUDIO_HAL_SERVICE_PREFIX)) {













                    pids.add(info.debugPid);













                }













            }













        } catch (RuntimeException e) {













            // ignored, pid hashset does not change













        }













    }

























    private void getAudioHalHidlPids(HashSet<Integer> pids) {















        try {















            IServiceManager serviceManager = IServiceManager.getService();















            ArrayList<IServiceManager.InstanceDebugInfo> dump =















                    serviceManager.debugDump();













            HashSet<Integer> pids = new HashSet<>();















            for (IServiceManager.InstanceDebugInfo info : dump) {















                if (info.pid != IServiceManager.PidConstant.NO_PID















                        && info.interfaceName != null









@@ -12894,12 +12908,18 @@ public class AudioService extends IAudioService.Stub













                    pids.add(info.pid);















                }















            }













            return pids;















        } catch (RemoteException | RuntimeException e) {













            return new HashSet<Integer>();













            // ignored, pid hashset does not change















        }















    }



























    private Set<Integer> getAudioHalPids() {













        HashSet<Integer> pids = new HashSet<>();













        getAudioAidlHalPids(pids);













        getAudioHalHidlPids(pids);













        return pids;













    }



























    private void updateAudioHalPids() {















        Set<Integer> pidsSet = getAudioHalPids();















        if (pidsSet.isEmpty()) {