diff options
| author | Gloria Wang <gwang@google.com> | 2011-07-21 15:10:22 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-07-25 16:09:58 -0700 |
| commit | 8f00151cbe693d52f3e233757c57fab3b6396d21 (patch) | |
| tree | e23cc93514f43af27aa3e2d7bcfce1b88d614a2b /drm/drmserver/DrmManagerService.cpp | |
| parent | 60c93010e8f96a179574ec66c00ec47a675319e3 (diff) | |
| download | frameworks_av-8f00151cbe693d52f3e233757c57fab3b6396d21.zip frameworks_av-8f00151cbe693d52f3e233757c57fab3b6396d21.tar.gz frameworks_av-8f00151cbe693d52f3e233757c57fab3b6396d21.tar.bz2 | |
Fix for bug 4371230.
- Generate unique ID for each DrmManagerClient in native side
- Fix the bug where multiple clients could use the same ID
- Return the correct unique ID back to Java
- Add a flag in the unique ID to separate native client and Java client
Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
Diffstat (limited to 'drm/drmserver/DrmManagerService.cpp')
| -rw-r--r-- | drm/drmserver/DrmManagerService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/drmserver/DrmManagerService.cpp b/drm/drmserver/DrmManagerService.cpp index 583669e..7ebcac3 100644 --- a/drm/drmserver/DrmManagerService.cpp +++ b/drm/drmserver/DrmManagerService.cpp @@ -78,8 +78,8 @@ DrmManagerService::~DrmManagerService() { delete mDrmManager; mDrmManager = NULL; } -int DrmManagerService::addUniqueId(int uniqueId) { - return mDrmManager->addUniqueId(uniqueId); +int DrmManagerService::addUniqueId(bool isNative) { + return mDrmManager->addUniqueId(isNative); } void DrmManagerService::removeUniqueId(int uniqueId) { |