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

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

Snap for 13585852 from dffd96a7 to 25Q3-release 

Change-Id: Ibed08c9ca8c6d1e20a86446f649d2e14ba10ca4a
parents f4b0609a dffd96a7

PREUPLOAD.cfg

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO 


hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



# go/alint for details

alint_hook = ${REPO_ROOT}/vendor/google/tools/alint



[Builtin Hooks]

bpfmt = true

clang_format = true

services/audioflinger/AudioFlinger.cpp

+145 −156

File changed.

Preview size limit exceeded, changes collapsed.

services/audioflinger/AudioFlinger.h

+6 −6
Original line number Diff line number Diff line
@@ -537,10 +537,10 @@ private: 
            REQUIRES(audio_utils::AudioFlinger_Mutex) {

        audio_io_handle_t io = AUDIO_IO_HANDLE_NONE;



        for (size_t i = 0; i < threads.size(); i++) {

            const uint32_t sessionType = threads.valueAt(i)->hasAudioSession(sessionId);

        for (const auto& [ioHandle, thread] : threads) {

            const uint32_t sessionType = thread->hasAudioSession(sessionId);

            if (sessionType != 0) {

                io = threads.keyAt(i);

                io = ioHandle;

                if ((sessionType & IAfThreadBase::EFFECT_SESSION) != 0) {

                    break; // effect chain here.

                }
@@ -686,7 +686,7 @@ private: 
    };



    mutable hardware_call_state mHardwareStatus = AUDIO_HW_IDLE;  // for dump only

    DefaultKeyedVector<audio_io_handle_t, sp<IAfPlaybackThread>> mPlaybackThreads

    std::map<audio_io_handle_t, sp<IAfPlaybackThread>> mPlaybackThreads

            GUARDED_BY(mutex());

    stream_type_t mStreamTypes[AUDIO_STREAM_CNT] GUARDED_BY(mutex());
@@ -694,7 +694,7 @@ private: 
    bool mMasterMute GUARDED_BY(mutex()) = false;

    float mMasterBalance GUARDED_BY(mutex()) = 0.f;



    DefaultKeyedVector<audio_io_handle_t, sp<IAfRecordThread>> mRecordThreads GUARDED_BY(mutex());

    std::map<audio_io_handle_t, sp<IAfRecordThread>> mRecordThreads GUARDED_BY(mutex());



    std::map<pid_t, sp<NotificationClient>> mNotificationClients GUARDED_BY(clientMutex());
@@ -721,7 +721,7 @@ private: 
                // list of MMAP stream control threads. Those threads allow for wake lock, routing

                // and volume control for activity on the associated MMAP stream at the HAL.

                // Audio data transfer is directly handled by the client creating the MMAP stream

    DefaultKeyedVector<audio_io_handle_t, sp<IAfMmapThread>> mMmapThreads GUARDED_BY(mutex());

    std::map<audio_io_handle_t, sp<IAfMmapThread>> mMmapThreads GUARDED_BY(mutex());



    // always returns non-null

    sp<Client> registerClient(pid_t pid, uid_t uid) EXCLUDES_AudioFlinger_ClientMutex;

services/camera/virtualcamera/VirtualCameraDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class VirtualCameraDevice 
      aidl::android::companion::virtualcamera::SupportedStreamConfiguration>

      mSupportedInputConfigurations;



  const bool mPerFrameCameraMetadataEnabled;

  [[maybe_unused]] const bool mPerFrameCameraMetadataEnabled;

  std::optional<::aidl::android::companion::virtualcamera::VirtualCameraMetadata>

      mConfigCameraCharacteristics;