commit 38225b2e4f56d61d4b1a84ffbda3890c0495c3e1
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 28 00:36:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 28 00:36:30 2017 +0000
tree 64908a53131dec1adfb0b67696e87965fd59d188
parent bdef4b98da312ddfc2c04dc9a4f11e50d9902717
parent 89437fbdd954dff939a576332dc36e4e640b96cb

Merge "Correct propagation of asynchonous events"

drm/1.0/default/DrmPlugin.cpp

diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp
index 1b2f90e..6f51e0e 100644
--- a/drm/1.0/default/DrmPlugin.cpp
+++ b/drm/1.0/default/DrmPlugin.cpp
@@ -321,6 +321,7 @@
 
     Return<void> DrmPlugin::setListener(const sp<IDrmPluginListener>& listener) {
         mListener = listener;
+        mLegacyPlugin->setListener(listener == NULL ? NULL : this);
         return Void();
     }
 
@@ -372,8 +373,10 @@
             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));
         }
     }