commit 3d2206df82c35bd612674f89eace16e4bfd0c26b
author Jeff Tinker <jtinker@google.com> Tue May 01 10:55:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 01 10:55:15 2018 -0700
tree 5f2cc17a3fce579dc462b2bd9f7716536fb9b6d5
parent 082afd2c0ad39aeecb5c96bdb9bbde089313e8bc
parent e641294b59e2a0792d894139d739228f182409b4

Fix abort due to missing hidl status check
am: e641294b59

Change-Id: I50fb411ec8f42a768bc163a4efe7633701a09769

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index 4e8ad52..06e8487 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -1186,9 +1186,9 @@
 
     DrmSessionManager::Instance()->useSession(sessionId);
 
-    Status status = mPlugin->setCipherAlgorithm(toHidlVec(sessionId),
+    Return<Status> status = mPlugin->setCipherAlgorithm(toHidlVec(sessionId),
             toHidlString(algorithm));
-    return toStatusT(status);
+    return status.isOk() ? toStatusT(status) : DEAD_OBJECT;
 }
 
 status_t DrmHal::setMacAlgorithm(Vector<uint8_t> const &sessionId,
@@ -1198,9 +1198,9 @@
 
     DrmSessionManager::Instance()->useSession(sessionId);
 
-    Status status = mPlugin->setMacAlgorithm(toHidlVec(sessionId),
+    Return<Status> status = mPlugin->setMacAlgorithm(toHidlVec(sessionId),
             toHidlString(algorithm));
-    return toStatusT(status);
+    return status.isOk() ? toStatusT(status) : DEAD_OBJECT;
 }
 
 status_t DrmHal::encrypt(Vector<uint8_t> const &sessionId,