diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-29 12:50:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-29 12:50:09 +0000 |
| commit | 38885b63fc41e664681b6fd12159c7ce04e3addc (patch) | |
| tree | 59d8a105b130b57df521d4f171f7043a14c3f42a /drm/java | |
| parent | ef099b71838e15758c8e859af21748a123bb4a99 (diff) | |
| parent | 38638b2fcc4aba428889d521d83762d716e32332 (diff) | |
am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '38638b2fcc4aba428889d521d83762d716e32332':
AArch64: Use long for pointers in DRM classes
Diffstat (limited to 'drm/java')
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index 10cdab0c223c..c05ea2e1a1e5 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -116,7 +116,7 @@ public class DrmManagerClient { private static final int ACTION_PROCESS_DRM_INFO = 1002; private int mUniqueId; - private int mNativeContext; + private long mNativeContext; private volatile boolean mReleased; private Context mContext; private InfoHandler mInfoHandler; |