diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-13 10:22:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-13 10:22:28 +0000 |
| commit | ba7a4e11a66a7044dbbd767983865e1774092dc6 (patch) | |
| tree | 2a0f477d4114b6cd3c0d2624d993fb4e136efe30 | |
| parent | 8b8e5d45928aed8592d321fe55f560e35a4fece8 (diff) | |
| parent | 90732a3be5e70156486aca94bde8aa81106329ba (diff) | |
| download | frameworks_av-ba7a4e11a66a7044dbbd767983865e1774092dc6.zip frameworks_av-ba7a4e11a66a7044dbbd767983865e1774092dc6.tar.gz frameworks_av-ba7a4e11a66a7044dbbd767983865e1774092dc6.tar.bz2 | |
am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"
* commit '90732a3be5e70156486aca94bde8aa81106329ba':
Remove dependency on Parcel::{read,write}IntPtr
| -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); } |