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

Commit 4f8f900d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move mediadrm-related headers"

parents 54792139 7d2c6e8b

drm/libmediadrm/CryptoHal.cpp

+3 −2
Original line number Diff line number Diff line
@@ -23,13 +23,14 @@ 


#include <binder/IMemory.h>

#include <cutils/native_handle.h>

#include <media/CryptoHal.h>

#include <hidlmemory/FrameworkUtils.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AString.h>

#include <media/stagefright/foundation/hexdump.h>

#include <media/stagefright/MediaErrors.h>

#include <hidlmemory/FrameworkUtils.h>

#include <mediadrm/CryptoHal.h>





using ::android::hardware::drm::V1_0::BufferType;

using ::android::hardware::drm::V1_0::DestinationBuffer;

drm/libmediadrm/DrmHal.cpp

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ 
#include <android/hidl/manager/1.0/IServiceManager.h>

#include <hidl/ServiceManagement.h>



#include <media/DrmHal.h>

#include <media/DrmSessionClientInterface.h>

#include <media/DrmSessionManager.h>

#include <media/EventMetric.h>

#include <media/PluginMetricsReporting.h>

#include <media/drm/DrmAPI.h>
@@ -37,6 +34,9 @@ 
#include <media/stagefright/foundation/AString.h>

#include <media/stagefright/foundation/hexdump.h>

#include <media/stagefright/MediaErrors.h>

#include <mediadrm/DrmHal.h>

#include <mediadrm/DrmSessionClientInterface.h>

#include <mediadrm/DrmSessionManager.h>



using drm::V1_0::KeyedVector;

using drm::V1_0::KeyStatusType;

drm/libmediadrm/DrmMetrics.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <utility>



#include <android-base/macros.h>

#include <media/DrmMetrics.h>

#include <media/stagefright/foundation/base64.h>

#include <mediadrm/DrmMetrics.h>

#include <sys/time.h>

#include <utils/Log.h>

#include <utils/Timers.h>

drm/libmediadrm/DrmPluginPath.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <utils/Log.h>



#include <cutils/properties.h>

#include <media/DrmPluginPath.h>

#include <mediadrm/DrmPluginPath.h>



namespace android {

drm/libmediadrm/DrmSessionManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <binder/IPCThreadState.h>

#include <binder/IProcessInfoService.h>

#include <binder/IServiceManager.h>

#include <media/DrmSessionManager.h>

#include <media/DrmSessionClientInterface.h>

#include <media/stagefright/ProcessInfo.h>

#include <mediadrm/DrmSessionClientInterface.h>

#include <mediadrm/DrmSessionManager.h>

#include <unistd.h>

#include <utils/String8.h>