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

Commit 8add485d authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "audiopolicy: restore normal binder call watchdog timeout" into pi-dev 

am: d9ed870e

Change-Id: Ic3312e78e43f1e49dd6ba3a831b32f95d779251a
parents 88a2cb38 d9ed870e

media/libaudioclient/IAudioPolicyService.cpp

+1 −14
Original line number Diff line number Diff line
@@ -895,20 +895,7 @@ status_t BnAudioPolicyService::onTransact( 
            break;

    }



    // FIXME: extend timeout for SET_DEVICE_CONNECTION_STATE and HANDLE_DEVICE_CONFIG_CHANGE

    // while we investigate why BT A2DP device connection/disconnection can sometimes

    // take more than 5 seconds

    uint32_t timeoutMs = TimeCheck::kDefaultTimeOutMs;

    switch (code) {

        case SET_DEVICE_CONNECTION_STATE:

        case HANDLE_DEVICE_CONFIG_CHANGE:

            timeoutMs *= 2;

            break;

        default:

            break;

    }



    TimeCheck check("IAudioPolicyService", timeoutMs);

    TimeCheck check("IAudioPolicyService");



    switch (code) {

        case SET_DEVICE_CONNECTION_STATE: {