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

Commit 72c96659 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Charisee Chiw
Browse files

CameraService: Updated watchdog disconnect timer 

- Update disconnect watchdog timer to prevent
thwarting of existing error handling for
timeouts and prevent from firing earlier than
intended delays.


Bug: 251252726
Bug: 247397845
Test: Manual
Change-Id: Id494157d02dae089a91305f128d9e4f5b660e30f
(cherry picked from commit 7d412d2c)
parent b9cefaf4

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;

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1742,7 +1742,7 @@ status_t Camera3Device::flush(int64_t *frameNumber) { 
    }



    // Calculate expected duration for flush with additional buffer time in ms for watchdog

    uint64_t maxExpectedDuration = (getExpectedInFlightDuration() + kBaseGetBufferWait) / 1e6;

    uint64_t maxExpectedDuration = ns2ms(getExpectedInFlightDuration() + kBaseGetBufferWait);

    status_t res = mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(mRequestThread->flush(),

            maxExpectedDuration / kCycleLengthMs, kCycleLengthMs);