commit 8c91fbdeca2dbab7ec861563a8de7fd415d57061
author Robert Shih <robertshih@google.com> Mon Feb 22 23:30:49 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 23:30:49 2021 +0000
tree 37c73c07315900ff0a81e5ef359ff59d1847caf0
parent 48e84f968f2cfa1484c14876ba19c33001bc6bee
parent 13eb27bb517a2202189af4096b138efd97cf597f

Merge "MediaDrm jni: get exception logs only if necessary" into sc-dev

media/jni/android_media_MediaDrm.cpp

diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 73e1f7d..56f6c45 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -424,7 +424,7 @@
 static bool throwExceptionAsNecessary(
         JNIEnv *env, const sp<IDrm> &drm, status_t err, const char *msg = NULL) {
     std::string msgStr;
-    if (drm != NULL) {
+    if (drm != NULL && err != OK) {
         msgStr = DrmUtils::GetExceptionMessage(err, msg, drm);
         msg = msgStr.c_str();
     }