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

Commit ebe19194 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12939960 from a226126b to 25Q2-release 

Change-Id: Ibe1857cf2a8e62e929a96de326a71840059dc62c
parents 23067aca a226126b

media/audio/aconfig/audio_framework.aconfig

+9 −1
Original line number Diff line number Diff line
@@ -27,7 +27,15 @@ flag { 
    name: "cache_get_stream_min_max_volume"

    namespace: "media_audio"

    description:

       "Cache getStream[Min|Max]Volume calls between AM and AS"

       "Cache getStream[Min|Max]Volume calls between AudioManager and AudioService"

    bug: "383667500"

}



flag {

    name: "cache_get_stream_volume"

    namespace: "media_audio"

    description:

       "Cache getStreamVolume calls between AudioManager and AudioService"

    bug: "383667500"

}

services/audioflinger/IAfEffect.h

+1 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public: 
    virtual status_t updatePolicyState() EXCLUDES_EffectBase_Mutex = 0;

    virtual bool purgeHandles() EXCLUDES_EffectBase_Mutex = 0;

    virtual void checkSuspendOnEffectEnabled(bool enabled, bool threadLocked) = 0;

    virtual bool suspended() const EXCLUDES_EffectBase_Mutex = 0;



    // mCallback is atomic so this can be lock-free.

    virtual void setCallback(const sp<EffectCallbackInterface>& callback) = 0;
@@ -135,7 +136,6 @@ private: 
    virtual status_t setEnabled(bool enabled, bool fromHandle) EXCLUDES_EffectBase_Mutex = 0;

    virtual status_t setEnabled_l(bool enabled) REQUIRES(audio_utils::EffectBase_Mutex) = 0;

    virtual void setSuspended(bool suspended) EXCLUDES_EffectBase_Mutex = 0;

    virtual bool suspended() const EXCLUDES_EffectBase_Mutex = 0;



    virtual ssize_t disconnectHandle(IAfEffectHandle* handle,

                                     bool unpinIfLast) EXCLUDES_EffectBase_Mutex = 0;

services/camera/libcameraservice/CameraService.cpp

+0 −2
Original line number Diff line number Diff line
@@ -4717,7 +4717,6 @@ status_t CameraService::BasicClient::isPrimaryClient(bool* isPrimary) { 
    }



    if (!mSharedMode) {

        ALOGW("%s: Invalid operation when camera is not opened in shared mode", __FUNCTION__);

        return INVALID_OPERATION;

    }

    *isPrimary = mIsPrimaryClient;
@@ -4732,7 +4731,6 @@ status_t CameraService::BasicClient::setPrimaryClient(bool isPrimary) { 
    }



    if (!mSharedMode) {

        ALOGW("%s:Invalid operation when camera is not opened in shared mode", __FUNCTION__);

        return INVALID_OPERATION;

    }

    mIsPrimaryClient = isPrimary;