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

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

Merge "Move mediadrm-related headers"

parents f3537c20 cd4d28fe

media/jni/android_media_MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


#include <gui/Surface.h>



#include <media/ICrypto.h>

#include <media/MediaCodecBuffer.h>

#include <media/stagefright/MediaCodec.h>

#include <media/stagefright/foundation/ABuffer.h>
@@ -46,6 +45,7 @@ 
#include <media/stagefright/foundation/AString.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/PersistentSurface.h>

#include <mediadrm/ICrypto.h>

#include <nativehelper/ScopedLocalRef.h>



#include <system/window.h>

media/jni/android_media_MediaCrypto.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 


#include <binder/IServiceManager.h>

#include <cutils/properties.h>

#include <media/ICrypto.h>

#include <media/IMediaDrmService.h>

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

#include <mediadrm/ICrypto.h>

#include <mediadrm/IMediaDrmService.h>



namespace android {

media/jni/android_media_MediaDrm.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ 
#include <binder/Parcel.h>

#include <binder/PersistableBundle.h>

#include <cutils/properties.h>

#include <media/IDrm.h>

#include <media/IMediaDrmService.h>

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

#include <media/stagefright/MediaErrors.h>

#include <mediadrm/IDrm.h>

#include <mediadrm/IMediaDrmService.h>



using ::android::os::PersistableBundle;