diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-29 12:12:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-29 12:12:14 +0000 |
| commit | 38638b2fcc4aba428889d521d83762d716e32332 (patch) | |
| tree | e5c3cf0b44b546d64af96c872c903f178fc4673a /drm/java | |
| parent | 4a58714606fdeb2e740b0ce51ea5074783e2ecf4 (diff) | |
| parent | eaae990695df28f00432978c417f7c47752cd6aa (diff) | |
am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit 'eaae990695df28f00432978c417f7c47752cd6aa':
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; |