OSDN Git Service

Fix for bug 4371230.
authorGloria Wang <gwang@google.com>
Thu, 21 Jul 2011 22:10:22 +0000 (15:10 -0700)
committerGloria Wang <gwang@google.com>
Mon, 25 Jul 2011 23:09:58 +0000 (16:09 -0700)
commita17d454fd0d20d14cf1fbc09f0f296cb6cbb870b
treee7ecaa5d516248aee80cf5887f50c5b75e91a0f4
parentae5df05f2246515a652f0c935c6deb85a0bdee01
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
12 files changed:
drm/common/IDrmManagerService.cpp
drm/drmserver/DrmManager.cpp
drm/drmserver/DrmManagerService.cpp
drm/java/android/drm/DrmManagerClient.java
drm/jni/android_drm_DrmManagerClient.cpp
drm/libdrmframework/DrmManagerClient.cpp
drm/libdrmframework/DrmManagerClientImpl.cpp
drm/libdrmframework/include/DrmManager.h
drm/libdrmframework/include/DrmManagerClientImpl.h
drm/libdrmframework/include/DrmManagerService.h
drm/libdrmframework/include/IDrmManagerService.h
drm/libdrmframework/plugins/common/include/DrmEngineBase.h