Merge "NuPlayerDriver: avoid deadlock."

status_t NuPlayerDriver::getDefaultBufferingSettings(BufferingSettings* buffering) {

    ALOGV("getDefaultBufferingSettings(%p)", this);

    {

        Mutex::Autolock autoLock(mLock);

        if (mState == STATE_IDLE) {

            return INVALID_OPERATION;

        }

    }

    return mPlayer->getDefaultBufferingSettings(buffering);

}

status_t NuPlayerDriver::setBufferingSettings(const BufferingSettings& buffering) {

    ALOGV("setBufferingSettings(%p)", this);

    {

        Mutex::Autolock autoLock(mLock);

        if (mState == STATE_IDLE) {

            return INVALID_OPERATION;

        }

    }

    return mPlayer->setBufferingSettings(buffering);

}