diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-06-09 15:51:38 -0700 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-06-12 18:02:30 +0100 |
| commit | 1766b08d35a45e12a13b264a5944e1b622b8715b (patch) | |
| tree | b2b3d9c15530974e67da937af2b80420040451e3 /media | |
| parent | c323737dd46d724b4c1ec230b283f26ae2a22b4f (diff) | |
| download | frameworks_av-1766b08d35a45e12a13b264a5944e1b622b8715b.zip frameworks_av-1766b08d35a45e12a13b264a5944e1b622b8715b.tar.gz frameworks_av-1766b08d35a45e12a13b264a5944e1b622b8715b.tar.bz2 | |
Remove dependency on Parcel::{read,write}IntPtr
bug: 15424960
bug: 15107693
(cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96)
Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ struct BpCrypto : public BpInterface<ICrypto> { 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 @@ status_t BnCrypto::onTransact( void *dstPtr; if (secure) { - dstPtr = (void *)data.readIntPtr(); + dstPtr = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64())); } else { dstPtr = malloc(totalSize); } |