commit e21495572bebb9c7b5fad745ca1516e53e8fd395
author Gloria Wang <gwang@google.com> Wed Jan 19 16:01:34 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 19 16:01:34 2011 -0800
tree 405625778609c9d65ff20fb3571227867100f16f
parent 62c64c48f8ae8142b893b20cf08fab2cb2a1d69f
parent 5cc52d46226bf1ab6faa8910413153c0b86dc5c9

am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
  More fix for 64 bit offset.

drm/common/IDrmManagerService.cpp

diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index 75edac6..ddbd220 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -382,7 +382,7 @@
     }
 
     data.writeInt32(playbackStatus);
-    data.writeInt32(position);
+    data.writeInt64(position);
 
     remote()->transact(SET_PLAYBACK_STATUS, data, &reply);
     return reply.readInt32();
@@ -1111,7 +1111,7 @@
         }
 
         const status_t status
-            = setPlaybackStatus(uniqueId, &handle, data.readInt32(), data.readInt32());
+            = setPlaybackStatus(uniqueId, &handle, data.readInt32(), data.readInt64());
         reply->writeInt32(status);
 
         delete handle.decryptInfo; handle.decryptInfo = NULL;