commit 814fd71fbc73a809d155442168917d8b1d131783
author Rahul Frias <rfrias@google.com> Tue Feb 02 01:42:38 2021 -0800
committer Rahul Frias <rfrias@google.com> Fri Feb 19 13:45:33 2021 -0800
tree a058871791c8b4cfb78308ecc2418959a9d8d363
parent ec3b5095cf9410411def8fcad8c0582aa9121412

Return error to NDK on failure

Corrections to AMediaDrm_openSession and AMediaDrm_provideKeyResponse
to return an appropriate error from the plugin.

Bug: 177481075
Test: NativeMediaDrmClearkeyTest
Change-Id: Ieedbf5b50902fb410286a567452f0020ff4f1a53

media/ndk/NdkMediaDrm.cpp

diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
index 3af9771..6e9945d 100644
--- a/media/ndk/NdkMediaDrm.cpp
+++ b/media/ndk/NdkMediaDrm.cpp
@@ -380,12 +380,15 @@
     }
     Vector<uint8_t> session;
     status_t status = mObj->mDrm->openSession(DrmPlugin::kSecurityLevelMax, session);
-    if (status == OK) {
-        mObj->mIds.push_front(session);
-        List<idvec_t>::iterator iter = mObj->mIds.begin();
-        sessionId->ptr = iter->array();
-        sessionId->length = iter->size();
+    if (status != OK) {
+        sessionId->ptr = NULL;
+        sessionId->length = 0;
+        return translateStatus(status);
     }
+    mObj->mIds.push_front(session);
+    List<idvec_t>::iterator iter = mObj->mIds.begin();
+    sessionId->ptr = iter->array();
+    sessionId->length = iter->size();
     return AMEDIA_OK;
 }
 
@@ -489,6 +492,7 @@
     } else {
         keySetId->ptr = NULL;
         keySetId->length = 0;
+        return translateStatus(status);
     }
     return AMEDIA_OK;
 }