commit 9ad157448aa08e1e9cfd0180cbec5a65e3afb118
author Robert Shih <robertshih@google.com> Fri Aug 02 14:15:01 2019 -0700
committer Robert Shih <robertshih@google.com> Wed Nov 13 10:12:58 2019 -0800
tree b975dcab03d4e07d7e6f8c438de018bf6f4956e6
parent 4d49f220060133fea8181fc41ba279f4bb521d65

IDrm: remove IBinder inheritance

Bug: 134787536
Test: GtsMediaTestCases
Change-Id: I8e409e7048c9058f2d91ad2d467131f49e378259

drm/libmediadrm/include/mediadrm/DrmHal.h

diff --git a/drm/libmediadrm/include/mediadrm/DrmHal.h b/drm/libmediadrm/include/mediadrm/DrmHal.h
index 0431c93..df1a79f 100644
--- a/drm/libmediadrm/include/mediadrm/DrmHal.h
+++ b/drm/libmediadrm/include/mediadrm/DrmHal.h
@@ -57,7 +57,7 @@
     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

diff --git a/drm/libmediadrm/include/mediadrm/IDrm.h b/drm/libmediadrm/include/mediadrm/IDrm.h
index fbe80c6..db79008 100644
--- a/drm/libmediadrm/include/mediadrm/IDrm.h
+++ b/drm/libmediadrm/include/mediadrm/IDrm.h
@@ -29,8 +29,9 @@
 
 struct AString;
 
-struct IDrm : public IInterface {
-    DECLARE_META_INTERFACE(Drm);
+struct IDrm : public virtual RefBase {
+
+    virtual ~IDrm() {}
 
     virtual status_t initCheck() const = 0;
 
@@ -146,19 +147,13 @@
 
     virtual status_t setListener(const sp<IDrmClient>& listener) = 0;
 
+protected:
+    IDrm() {}
+
 private:
     DISALLOW_EVIL_CONSTRUCTORS(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;
-};
-
 }  // namespace android
 
 #endif // ANDROID_IDRM_H_