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

Commit c187d3fc authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Remove unused MediaDrm.unprovisionDevice"

parents cbc455fb 6ca0256a

drm/mediadrm/plugins/clearkey/DrmPlugin.h

+0 −4
Original line number Diff line number Diff line
@@ -105,10 +105,6 @@ public: 
        return android::ERROR_DRM_CANNOT_HANDLE;

    }



    virtual status_t unprovisionDevice() {

        return android::ERROR_DRM_CANNOT_HANDLE;

    }



    virtual status_t getSecureStops(List<Vector<uint8_t> >& secureStops) {

        UNUSED(secureStops);

        return android::ERROR_DRM_CANNOT_HANDLE;

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp

+0 −6
Original line number Diff line number Diff line
@@ -312,12 +312,6 @@ namespace android { 
        return OK;

    }



    status_t MockDrmPlugin::unprovisionDevice()

    {

        ALOGD("MockDrmPlugin::unprovisionDevice()");

        return OK;

    }



    status_t MockDrmPlugin::getSecureStop(Vector<uint8_t> const & /* ssid */,

                                          Vector<uint8_t> & secureStop)

    {

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ namespace android { 
                                          Vector<uint8_t> &certificate,

                                          Vector<uint8_t> &wrappedKey);



        status_t unprovisionDevice();



        status_t getSecureStops(List<Vector<uint8_t> > &secureStops);

        status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop);

        status_t releaseSecureStops(Vector<uint8_t> const &ssRelease);

include/media/IDrm.h

+0 −2
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ struct IDrm : public IInterface { 
                                              Vector<uint8_t> &certificate,

                                              Vector<uint8_t> &wrappedKey) = 0;



    virtual status_t unprovisionDevice() = 0;



    virtual status_t getSecureStops(List<Vector<uint8_t> > &secureStops) = 0;

    virtual status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop) = 0;

media/libmedia/IDrm.cpp

+0 −21
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ enum { 
    SIGN_RSA,

    VERIFY,

    SET_LISTENER,

    UNPROVISION_DEVICE,

    GET_SECURE_STOP,

    RELEASE_ALL_SECURE_STOPS

};
@@ -277,18 +276,6 @@ struct BpDrm : public BpInterface<IDrm> { 
        return reply.readInt32();

    }



    virtual status_t unprovisionDevice() {

        Parcel data, reply;

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



        status_t status = remote()->transact(UNPROVISION_DEVICE, data, &reply);

        if (status != OK) {

            return status;

        }



        return reply.readInt32();

    }



    virtual status_t getSecureStops(List<Vector<uint8_t> > &secureStops) {

        Parcel data, reply;

        data.writeInterfaceToken(IDrm::getInterfaceDescriptor());
@@ -749,14 +736,6 @@ status_t BnDrm::onTransact( 
            return OK;

        }



        case UNPROVISION_DEVICE:

        {

            CHECK_INTERFACE(IDrm, data, reply);

            status_t result = unprovisionDevice();

            reply->writeInt32(result);

            return OK;

        }



        case GET_SECURE_STOPS:

        {

            CHECK_INTERFACE(IDrm, data, reply);