diff options
Diffstat (limited to 'libs/gui/DisplayEventReceiver.cpp')
| -rw-r--r-- | libs/gui/DisplayEventReceiver.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libs/gui/DisplayEventReceiver.cpp b/libs/gui/DisplayEventReceiver.cpp index b916e48f79..1bef2b7893 100644 --- a/libs/gui/DisplayEventReceiver.cpp +++ b/libs/gui/DisplayEventReceiver.cpp @@ -39,7 +39,13 @@ DisplayEventReceiver::DisplayEventReceiver( mEventConnection = sf->createDisplayEventConnection(vsyncSource, eventRegistration); if (mEventConnection != nullptr) { mDataChannel = std::make_unique<gui::BitTube>(); - mEventConnection->stealReceiveChannel(mDataChannel.get()); + const auto status = mEventConnection->stealReceiveChannel(mDataChannel.get()); + if (!status.isOk()) { + ALOGE("stealReceiveChannel failed: %s", status.toString8().c_str()); + mInitError = std::make_optional<status_t>(status.transactionError()); + mDataChannel.reset(); + mEventConnection.clear(); + } } } } @@ -50,12 +56,11 @@ DisplayEventReceiver::~DisplayEventReceiver() { status_t DisplayEventReceiver::initCheck() const { if (mDataChannel != nullptr) return NO_ERROR; - return NO_INIT; + return mInitError.has_value() ? mInitError.value() : NO_INIT; } int DisplayEventReceiver::getFd() const { - if (mDataChannel == nullptr) - return NO_INIT; + if (mDataChannel == nullptr) return mInitError.has_value() ? mInitError.value() : NO_INIT; return mDataChannel->getFd(); } @@ -68,7 +73,7 @@ status_t DisplayEventReceiver::setVsyncRate(uint32_t count) { mEventConnection->setVsyncRate(count); return NO_ERROR; } - return NO_INIT; + return mInitError.has_value() ? mInitError.value() : NO_INIT; } status_t DisplayEventReceiver::requestNextVsync() { @@ -76,7 +81,7 @@ status_t DisplayEventReceiver::requestNextVsync() { mEventConnection->requestNextVsync(); return NO_ERROR; } - return NO_INIT; + return mInitError.has_value() ? mInitError.value() : NO_INIT; } ssize_t DisplayEventReceiver::getEvents(DisplayEventReceiver::Event* events, |