IDrm: remove IBinder inheritance

Bug: 134787536
Test: GtsMediaTestCases
Change-Id: I8e409e7048c9058f2d91ad2d467131f49e378259
gugelfrei
Robert Shih 5 years ago
parent 4d49f22006
commit 9ad157448a

@ -17,7 +17,6 @@ cc_library_shared {
srcs: [
"DrmPluginPath.cpp",
"DrmSessionManager.cpp",
"IDrm.cpp",
"IDrmClient.cpp",
"IMediaDrmService.cpp",
"SharedLibrary.cpp",

File diff suppressed because it is too large Load Diff

@ -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 {

@ -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

Loading…
Cancel
Save