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

Commit 004ac55a authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix mismatched-tags error"

am: 604224ed

Change-Id: If4e438ff18fd6035f26f5a2214f6b1f4a0fa2fb6
parents e27bc81a 604224ed
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace android {

struct ABuffer;
struct ALooper;
struct AudioTrack;
class AudioTrack;
class IGraphicBufferProducer;
struct MediaCodec;
struct NuMediaExtractor;
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
namespace android {

struct IHDCP;
struct IMediaCodecList;
class IMediaCodecList;
struct IMediaHTTPService;
class IMediaRecorder;
class IOMX;
+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct MediaCodecInfo : public RefBase {

        DISALLOW_EVIL_CONSTRUCTORS(Capabilities);

        friend class MediaCodecInfo;
        friend struct MediaCodecInfo;
    };

    // Use a subclass to allow setting fields on construction without allowing
@@ -136,7 +136,7 @@ private:

    DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);

    friend class MediaCodecList;
    friend struct MediaCodecList;
    friend class MediaCodecListOverridesTest;
};

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@
namespace android {

struct ABuffer;
struct MemoryDealer;
class MemoryDealer;
struct DescribeColorFormat2Params;
struct DataConverter;

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct FrameRenderTracker {
        sp<GraphicBuffer> mGraphicBuffer;
        sp<Fence> mFence;

        friend class FrameRenderTracker;
        friend struct FrameRenderTracker;
    };

    FrameRenderTracker();
Loading