From a17d454fd0d20d14cf1fbc09f0f296cb6cbb870b Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Thu, 21 Jul 2011 15:10:22 -0700 Subject: 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 --- drm/java/android/drm/DrmManagerClient.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drm/java/android') diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index f3a034307ad9..9a7194c4d637 100755 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -248,9 +248,7 @@ public class DrmManagerClient { mEventHandler = new EventHandler(eventThread.getLooper()); // save the unique id - mUniqueId = hashCode(); - - _initialize(mUniqueId, new WeakReference(this)); + mUniqueId = _initialize(new WeakReference(this)); } protected void finalize() { @@ -794,7 +792,7 @@ public class DrmManagerClient { } // private native interfaces - private native void _initialize(int uniqueId, Object weak_this); + private native int _initialize(Object weak_this); private native void _finalize(int uniqueId); -- cgit v1.2.3-59-g8ed1b