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

Commit fcf499f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[audio] Add native AudioService interface impl" into main

parents f21dcbab 44b8e00d

media/java/android/media/IAudioService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.media.BluetoothProfileConnectionInfo; 
import android.media.FadeManagerConfiguration;

import android.media.IAudioDeviceVolumeDispatcher;

import android.media.IAudioFocusDispatcher;

import android.media.IAudioManagerNative;

import android.media.IAudioModeDispatcher;

import android.media.IAudioRoutesObserver;

import android.media.IAudioServerStateDispatcher;
@@ -83,6 +84,7 @@ interface IAudioService { 
    // When a method's argument list is changed, BpAudioManager's corresponding serialization code

    // (if any) in frameworks/native/services/audiomanager/IAudioManager.cpp must be updated.



    IAudioManagerNative getNativeInterface();

    int trackPlayer(in PlayerBase.PlayerIdCard pic);



    oneway void playerAttributes(in int piid, in AudioAttributes attr);

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

+19 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import static android.media.AudioManager.RINGER_MODE_NORMAL; 
import static android.media.AudioManager.RINGER_MODE_SILENT;

import static android.media.AudioManager.RINGER_MODE_VIBRATE;

import static android.media.AudioManager.STREAM_SYSTEM;

import static android.media.IAudioManagerNative.HardeningType;

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

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

import static android.media.audio.Flags.concurrentAudioRecordBypassPermission;
@@ -151,6 +152,7 @@ import android.media.BluetoothProfileConnectionInfo; 
import android.media.FadeManagerConfiguration;

import android.media.IAudioDeviceVolumeDispatcher;

import android.media.IAudioFocusDispatcher;

import android.media.IAudioManagerNative;

import android.media.IAudioModeDispatcher;

import android.media.IAudioRoutesObserver;

import android.media.IAudioServerStateDispatcher;
@@ -835,6 +837,18 @@ public class AudioService extends IAudioService.Stub 
    private final UserRestrictionsListener mUserRestrictionsListener =

            new AudioServiceUserRestrictionsListener();













    private final IAudioManagerNative mNativeShim = new IAudioManagerNative.Stub() {













        // oneway













        @Override













        public void playbackHardeningEvent(int uid, byte type, boolean bypassed) {













        }

























        @Override













        public void permissionUpdateBarrier() {













            AudioService.this.permissionUpdateBarrier();













        }













    };



























    // List of binder death handlers for setMode() client processes.















    // The last process to have called setMode() is at the top of the list.















    // package-private so it can be accessed in AudioDeviceBroker.getSetModeDeathHandlers










@@ -2811,6 +2825,11 @@ public class AudioService extends IAudioService.Stub













                args, callback, resultReceiver);















    }



























    @Override













    public IAudioManagerNative getNativeInterface() {













        return mNativeShim;













    }



























    /** @see AudioManager#getSurroundFormats() */















    @Override















    public Map<Integer, Boolean> getSurroundFormats() {