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

Commit 1118824b authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioSystem: Modernize return value optimization" into main am: 7422b88f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2995516



Change-Id: I38b8237112a48df033044384f0db227fb23a20aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fd41e43 7422b88f

media/libaudioclient/AudioSystem.cpp

+147 −148

File changed.

Preview size limit exceeded, changes collapsed.

media/libaudioclient/include/media/AudioSystem.h

+3 −3
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ public: 
    static status_t setLocalAudioFlinger(const sp<IAudioFlinger>& af);



    // helper function to obtain AudioFlinger service handle

    static const sp<IAudioFlinger> get_audio_flinger();

    static const sp<IAudioFlinger> get_audio_flinger_for_fuzzer();

    static sp<IAudioFlinger> get_audio_flinger();

    static sp<IAudioFlinger> get_audio_flinger_for_fuzzer();



    static float linearToLog(int volume);

    static int logToLinear(float volume);
@@ -407,7 +407,7 @@ public: 
    // and output configuration cache (gOutputs)

    static void clearAudioConfigCache();



    static const sp<media::IAudioPolicyService> get_audio_policy_service();

    static sp<media::IAudioPolicyService> get_audio_policy_service();

    static void clearAudioPolicyService();



    // helpers for android.media.AudioManager.getProperty(), see description there for meaning