summaryrefslogtreecommitdiffstats
path: root/drm/common/IDrmManagerService.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-09 16:11:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-09 16:11:04 -0800
commit609ce04d29780c430ff7e17511fc073a664c02d5 (patch)
treed58529815cfcf9ea9d9a92cf70917625ff64ce9b /drm/common/IDrmManagerService.cpp
parentc4122f56d6c3425666b67a81ed2d7224c8a4cda3 (diff)
parent0592e3cc541aa0c6477e00ddb052558a5a3e17c1 (diff)
downloadframeworks_av-609ce04d29780c430ff7e17511fc073a664c02d5.zip
frameworks_av-609ce04d29780c430ff7e17511fc073a664c02d5.tar.gz
frameworks_av-609ce04d29780c430ff7e17511fc073a664c02d5.tar.bz2
am 256290b1: am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1
* commit '256290b1efac8b0798964585c3c3d4600d9587ef': - Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039
Diffstat (limited to 'drm/common/IDrmManagerService.cpp')
-rw-r--r--drm/common/IDrmManagerService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index ddbd220..696e305 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -596,7 +596,7 @@ DecryptHandle* BpDrmManagerService::openDecryptSession(int uniqueId, const char*
handle->decryptInfo->decryptBufferLength = reply.readInt32();
}
} else {
- LOGE("no decryptHandle is generated in service side");
+ LOGV("no decryptHandle is generated in service side");
}
return handle;
}
@@ -1308,7 +1308,7 @@ status_t BnDrmManagerService::onTransact(
delete handle->decryptInfo; handle->decryptInfo = NULL;
}
} else {
- LOGE("NULL decryptHandle is returned");
+ LOGV("NULL decryptHandle is returned");
}
delete handle; handle = NULL;
return DRM_NO_ERROR;