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

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

Merge "IDrm: remove IBinder inheritance"

parents 2dbaf01a 9ad15744

drm/libmediadrm/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ cc_library_shared { 
    srcs: [

        "DrmPluginPath.cpp",

        "DrmSessionManager.cpp",

        "IDrm.cpp",

        "IDrmClient.cpp",

        "IMediaDrmService.cpp",

        "SharedLibrary.cpp",

drm/libmediadrm/IDrm.cpp

deleted100644 → 0
+0 −1242

File deleted.

Preview size limit exceeded, changes collapsed.

drm/libmediadrm/include/mediadrm/DrmHal.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ inline bool operator==(const Vector<uint8_t> &l, const Vector<uint8_t> &r) { 
    return memcmp(l.array(), r.array(), l.size()) == 0;

}



struct DrmHal : public BnDrm,

struct DrmHal : public IDrm,

                public IBinder::DeathRecipient,

                public IDrmPluginListener_V1_2 {

drm/libmediadrm/include/mediadrm/IDrm.h

+6 −11
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ namespace android { 


struct AString;



struct IDrm : public IInterface {

    DECLARE_META_INTERFACE(Drm);

struct IDrm : public virtual RefBase {



    virtual ~IDrm() {}



    virtual status_t initCheck() const = 0;
@@ -146,17 +147,11 @@ struct IDrm : public IInterface { 


    virtual status_t setListener(const sp<IDrmClient>& listener) = 0;



private:

    DISALLOW_EVIL_CONSTRUCTORS(IDrm);

};

protected:

    IDrm() {}



struct BnDrm : public BnInterface<IDrm> {

    virtual status_t onTransact(

            uint32_t code, const Parcel &data, Parcel *reply,

            uint32_t flags = 0);

private:

    void readVector(const Parcel &data, Vector<uint8_t> &vector) const;

    void writeVector(Parcel *reply, Vector<uint8_t> const &vector) const;

    DISALLOW_EVIL_CONSTRUCTORS(IDrm);

};



}  // namespace android