diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-06-11 22:42:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-11 21:23:31 +0000 |
| commit | c5a66b77adcdfa2a403dfddc5ef3469fada75683 (patch) | |
| tree | ef85b25442af39ad9c5d84ce373e12a0f1c0cb59 /media | |
| parent | b9e55c4f17a91f070f78fb9fd72c08e461526e9e (diff) | |
| parent | bcca9e072c1f288a53ce6862936f57dc36488f96 (diff) | |
| download | frameworks_av-c5a66b77adcdfa2a403dfddc5ef3469fada75683.zip frameworks_av-c5a66b77adcdfa2a403dfddc5ef3469fada75683.tar.gz frameworks_av-c5a66b77adcdfa2a403dfddc5ef3469fada75683.tar.bz2 | |
Merge "Remove dependency on Parcel::{read,write}IntPtr"
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); } |