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

Commit 21a73c94 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge changes from topic "MusicFx_prostate" into main am: a35f3f45 am: 422e3933 

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



Change-Id: I8500271578f1858d2acb7418afb9b14ccb9f2659
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78fbd7d1 422e3933

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

+5 −0
Original line number Diff line number Diff line
@@ -13332,6 +13332,11 @@ public class AudioService extends IAudioService.Stub 
        return mDeviceBroker.getDeviceSensorUuid(device);

    }













    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)













    MusicFxHelper getMusicFxHelper() {













        return mMusicFxHelper;













    }



























    //======================















    // misc















    //======================

























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



+240
−126


























File changed.
Preview size limit exceeded, changes collapsed.
























services/tests/servicestests/src/com/android/server/audio/MusicFxHelperTest.java
0 → 100644



+642
−0


























File added.
Preview size limit exceeded, changes collapsed.