Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba7a4e11 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr" 

* commit '90732a3b':
  Remove dependency on Parcel::{read,write}IntPtr
parents 8b8e5d45 90732a3b

media/libmedia/ICrypto.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

            }