commit 1fabe85b201b499c8c0c2133edfd3cd346174042
author Jeff Tinker <jtinker@google.com> Tue Jan 30 19:19:34 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jan 30 21:10:03 2018 +0000
tree 554ffc16d6eb4c3e370242a88c5ac416dd2b9a57
parent 68690974afd3d4db37d257b063be7c7a786d2c33

Revert "Fix missing check of hidl return status"

This reverts commit 09a90ab544a785b36c5b2d1ef352289e2b6f5633.

Fix for regressed b/72666743

Test: manual test to confirm problem is fixed.
See bug for repro steps.

Change-Id: Ifac9a2c3a3a92063d544e39ace48ab14c90b8050
(cherry picked from commit b2b66fa4da5528cf9cdfc32f619e81e4d97ca654)

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index b5c1ddf..d7816d7 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -252,9 +252,9 @@
 
 void DrmHal::closeOpenSessions() {
     if (mPlugin != NULL) {
-        auto openSessions = mOpenSessions;
-        for (size_t i = 0; i < openSessions.size(); i++) {
-            closeSession(openSessions[i]);
+        for (size_t i = 0; i < mOpenSessions.size(); i++) {
+            mPlugin->closeSession(toHidlVec(mOpenSessions[i]));
+            DrmSessionManager::Instance()->removeSession(mOpenSessions[i]);
         }
     }
     mOpenSessions.clear();