commit a55209dcdf9e4a17373be384e8b02ec88d998dac
author Kyle Zhang <kelzhan@google.com> Thu Feb 03 01:52:46 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Thu Feb 03 20:48:40 2022 +0000
tree 54bf55e6909c5bccdf185589136f75f629ef5c5c
parent 0a65477981dbba11064ff47e00ae4bd6fab4e701

Fix drm aidl listeners

This is a part of change to fix cts test issue on drm framework by using clearkey aidl as the backend plugin.

Test: atest
CtsMediaDrmTestCases: android.media.drm.cts.NativeMediaDrmClearkeyTest#testClearKeyPlaybackCenc
Bug: 206804036
Change-Id: I2ad8a863dc1804e74d0fc40b933473546ed39b4a

drm/libmediadrm/include/mediadrm/DrmHalHidl.h

diff --git a/drm/libmediadrm/include/mediadrm/DrmHalHidl.h b/drm/libmediadrm/include/mediadrm/DrmHalHidl.h
index 91dc700..94ef285 100644
--- a/drm/libmediadrm/include/mediadrm/DrmHalHidl.h
+++ b/drm/libmediadrm/include/mediadrm/DrmHalHidl.h
@@ -17,10 +17,6 @@
 #ifndef DRM_HAL_HIDL_H_
 #define DRM_HAL_HIDL_H_
 
-#include <android/hardware/drm/1.0/IDrmFactory.h>
-#include <android/hardware/drm/1.0/IDrmPlugin.h>
-#include <android/hardware/drm/1.1/IDrmFactory.h>
-#include <android/hardware/drm/1.1/IDrmPlugin.h>
 #include <android/hardware/drm/1.2/IDrmFactory.h>
 #include <android/hardware/drm/1.2/IDrmPlugin.h>
 #include <android/hardware/drm/1.2/IDrmPluginListener.h>
@@ -255,4 +251,4 @@
 
 }  // namespace android
 
-#endif  // DRM_HAL_H_
+#endif // DRM_HAL_HIDL_H_