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

Commit 38225b2e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Correct propagation of asynchonous events"

parents bdef4b98 89437fbd
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ namespace implementation {

    Return<void> DrmPlugin::setListener(const sp<IDrmPluginListener>& listener) {
        mListener = listener;
        mLegacyPlugin->setListener(listener == NULL ? NULL : this);
        return Void();
    }

@@ -372,8 +373,10 @@ namespace implementation {
            break;
        }
        if (sendEvent) {
            mListener->sendEvent(eventType, toHidlVec(*sessionId),
                    toHidlVec(*data));
            Vector<uint8_t> emptyVector;
            mListener->sendEvent(eventType,
                    toHidlVec(sessionId == NULL ? emptyVector: *sessionId),
                    toHidlVec(data == NULL ? emptyVector: *data));
        }
    }