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

Commit b752850e authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "IMediaDrmService: remove makeCrypto method"

parents 969326bf 1c38352a

drm/libmediadrm/DrmUtils.cpp

+4 −1
Original line number Diff line number Diff line
@@ -78,7 +78,10 @@ sp<IDrm> MakeDrm(status_t *pstatus) { 
}



sp<ICrypto> MakeCrypto(status_t *pstatus) {

    return MakeObject<ICrypto, CryptoHal>(pstatus);

    if (pstatus) {

        *pstatus = OK;

    }

    return new CryptoHal();

}



}  // namespace DrmUtils

drm/libmediadrm/IMediaDrmService.cpp

+0 −18
Original line number Diff line number Diff line
@@ -42,13 +42,6 @@ public: 
    {

    }



    virtual sp<ICrypto> makeCrypto() {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaDrmService::getInterfaceDescriptor());

        remote()->transact(MAKE_CRYPTO, data, &reply);

        return interface_cast<ICrypto>(reply.readStrongBinder());

    }



    virtual sp<IDrm> makeDrm() {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaDrmService::getInterfaceDescriptor());
@@ -66,12 +59,6 @@ status_t BnMediaDrmService::onTransact( 
    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

    switch (code) {

        case MAKE_CRYPTO: {

            CHECK_INTERFACE(IMediaDrmService, data, reply);

            sp<ICrypto> crypto = makeCrypto();

            reply->writeStrongBinder(IInterface::asBinder(crypto));

            return NO_ERROR;

        } break;

        case MAKE_DRM: {

            CHECK_INTERFACE(IMediaDrmService, data, reply);

            sp<IDrm> drm = makeDrm();
@@ -90,9 +77,4 @@ sp<IDrm> IMediaDrmService::makeObject<IDrm>() { 
    return makeDrm();

}



template<>

sp<ICrypto> IMediaDrmService::makeObject<ICrypto>() {

    return makeCrypto();

}



} // namespace android

drm/libmediadrm/include/mediadrm/IMediaDrmService.h

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


namespace android {



struct ICrypto;

struct IDrm;



class IMediaDrmService: public IInterface
@@ -33,8 +32,6 @@ class IMediaDrmService: public IInterface 
public:

    DECLARE_META_INTERFACE(MediaDrmService);





    virtual sp<ICrypto>         makeCrypto() = 0;

    virtual sp<IDrm>            makeDrm() = 0;



    template<typename I> sp<I>  makeObject();

services/mediadrm/MediaDrmService.cpp

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ void MediaDrmService::instantiate() { 
            String16("media.drm"), new MediaDrmService());

}



sp<ICrypto> MediaDrmService::makeCrypto() {

    return new CryptoHal;

}



sp<IDrm> MediaDrmService::makeDrm() {

    return new DrmHal;

}

services/mediadrm/MediaDrmService.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ public: 
    static void instantiate();



    // IMediaDrmService interface

    virtual sp<ICrypto> makeCrypto();

    virtual sp<IDrm> makeDrm();

private:

    MediaDrmService() {}