commit bcca9e072c1f288a53ce6862936f57dc36488f96
author Jeff Tinker <jtinker@google.com> Mon Jun 09 15:51:38 2014 -0700
committer Jeff Tinker <jtinker@google.com> Tue Jun 10 13:09:46 2014 -0700
tree d705cbf92c0385ee82a2626e7bc8003df4fd6768
parent 1a93f0cbb99fc5a59c92bd913f29409022ae236d

Remove dependency on Parcel::{read,write}IntPtr

bug: 15424960
bug: 15107693

Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1

media/libmedia/ICrypto.cpp

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 98b183a..0d5f990 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -131,7 +131,7 @@
         data.write(subSamples, sizeof(CryptoPlugin::SubSample) * numSubSamples);
 
         if (secure) {
-            data.writeIntPtr((intptr_t)dstPtr);
+            data.writeInt64(static_cast<uint64_t>(reinterpret_cast<uintptr_t>(dstPtr)));
         }
 
         remote()->transact(DECRYPT, data, &reply);
@@ -249,7 +249,7 @@
 
             void *dstPtr;
             if (secure) {
-                dstPtr = (void *)data.readIntPtr();
+                dstPtr = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));
             } else {
                 dstPtr = malloc(totalSize);
             }