summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Shih <robertshih@google.com> 2021-02-22 23:30:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-02-22 23:30:49 +0000
commit8c91fbdeca2dbab7ec861563a8de7fd415d57061 (patch)
tree37c73c07315900ff0a81e5ef359ff59d1847caf0
parent48e84f968f2cfa1484c14876ba19c33001bc6bee (diff)
parent13eb27bb517a2202189af4096b138efd97cf597f (diff)
Merge "MediaDrm jni: get exception logs only if necessary" into sc-dev
-rw-r--r--media/jni/android_media_MediaDrm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 73e1f7df89a1..56f6c45bb50e 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -424,7 +424,7 @@ static bool isSessionException(status_t err) {
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();
}