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

Commit a67eff3d authored by Xin Li's avatar Xin Li
Browse files

Merge TQ1A.221205.012 

Bug: 255404110

Merged-In: Ib19afd740e10d8bc26fc173641f7463719d079fd
Change-Id: I1fee9c49a3c978ad9af640d36ac409f987a468c0
parents 3882c24a cf251a84

services/audioflinger/AudioFlinger.cpp

+1 −5
Original line number Diff line number Diff line
@@ -1067,8 +1067,6 @@ status_t AudioFlinger::createTrack(const media::CreateTrackRequest& _input, 
        clientPid = callingPid;

        adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));

    }

    adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(

            adjAttributionSource);



    audio_session_t sessionId = input.sessionId;

    if (sessionId == AUDIO_SESSION_ALLOCATE) {
@@ -2291,8 +2289,7 @@ status_t AudioFlinger::createRecord(const media::CreateRecordRequest& _input, 
                 __func__, callingUid, callingPid, currentPid);

        adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));

    }

    adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(

            adjAttributionSource);



    // we don't yet support anything other than linear PCM

    if (!audio_is_valid_format(input.config.format) || !audio_is_linear_pcm(input.config.format)) {

        ALOGE("createRecord() invalid format %#x", input.config.format);
@@ -3925,7 +3922,6 @@ status_t AudioFlinger::createEffect(const media::CreateEffectRequest& request, 
        adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));

        currentPid = callingPid;

    }

    adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(adjAttributionSource);



    ALOGV("createEffect pid %d, effectClient %p, priority %d, sessionId %d, io %d, factory %p",

          adjAttributionSource.pid, effectClient.get(), priority, sessionId, io,

services/audioflinger/Threads.cpp

+6 −4
Original line number Diff line number Diff line
@@ -8315,6 +8315,8 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe 
    audio_input_flags_t inputFlags = mInput->flags;

    audio_input_flags_t requestedFlags = *flags;

    uint32_t sampleRate;

    AttributionSourceState checkedAttributionSource = AudioFlinger::checkAttributionSourcePackage(

            attributionSource);



    lStatus = initCheck();

    if (lStatus != NO_ERROR) {
@@ -8329,7 +8331,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe 
    }



    if (maxSharedAudioHistoryMs != 0) {

        if (!captureHotwordAllowed(attributionSource)) {

        if (!captureHotwordAllowed(checkedAttributionSource)) {

            lStatus = PERMISSION_DENIED;

            goto Exit;

        }
@@ -8450,16 +8452,16 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe 
        Mutex::Autolock _l(mLock);

        int32_t startFrames = -1;

        if (!mSharedAudioPackageName.empty()

                && mSharedAudioPackageName == attributionSource.packageName

                && mSharedAudioPackageName == checkedAttributionSource.packageName

                && mSharedAudioSessionId == sessionId

                && captureHotwordAllowed(attributionSource)) {

                && captureHotwordAllowed(checkedAttributionSource)) {

            startFrames = mSharedAudioStartFrames;

        }



        track = new RecordTrack(this, client, attr, sampleRate,

                      format, channelMask, frameCount,

                      nullptr /* buffer */, (size_t)0 /* bufferSize */, sessionId, creatorPid,

                      attributionSource, *flags, TrackBase::TYPE_DEFAULT, portId,

                      checkedAttributionSource, *flags, TrackBase::TYPE_DEFAULT, portId,

                      startFrames);



        lStatus = track->initCheck();

services/audioflinger/Tracks.cpp

+4 −1
Original line number Diff line number Diff line
@@ -529,7 +529,10 @@ AudioFlinger::PlaybackThread::OpPlayAudioMonitor::createIfNeeded( 
            id, attr.flags);

        return nullptr;

    }

    return new OpPlayAudioMonitor(attributionSource, attr.usage, id);



    AttributionSourceState checkedAttributionSource = AudioFlinger::checkAttributionSourcePackage(

            attributionSource);

    return new OpPlayAudioMonitor(checkedAttributionSource, attr.usage, id);

}



AudioFlinger::PlaybackThread::OpPlayAudioMonitor::OpPlayAudioMonitor(

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+8 −4
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ 


namespace android {



const static size_t kDisconnectTimeoutMs = 2500;



using namespace camera2;



// Interface used by CameraService
@@ -252,10 +250,16 @@ status_t Camera2ClientBase<TClientBase>::dumpDevice( 


template <typename TClientBase>

binder::Status Camera2ClientBase<TClientBase>::disconnect() {

    if (mCameraServiceWatchdog != nullptr) {

    if (mCameraServiceWatchdog != nullptr && mDevice != nullptr) {

        // Timer for the disconnect call should be greater than getExpectedInFlightDuration

        // since this duration is used to error handle methods in the disconnect sequence

        // thus allowing existing error handling methods to execute first

        uint64_t maxExpectedDuration =

                ns2ms(mDevice->getExpectedInFlightDuration() + kBufferTimeDisconnectNs);



        // Initialization from hal succeeded, time disconnect.

        return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),

                kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);

                maxExpectedDuration / kCycleLengthMs, kCycleLengthMs);

    }

    return disconnectImpl();

}

services/camera/libcameraservice/common/Camera2ClientBase.h

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ public: 


protected:



    // Used for watchdog timeout to monitor disconnect

    static const nsecs_t kBufferTimeDisconnectNs = 3000000000; // 3 sec.



    // The PID provided in the constructor call

    pid_t mInitialClientPid;

    bool mOverrideForPerfClass = false;