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

Commit 04c9683a authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev

parents 7b97351b 1495ceb8

include/gui/ISurfaceComposer.h

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




class ComposerState;

class ComposerState;

class DisplayState;

class DisplayState;

class DisplayInfo;

struct DisplayInfo;

class DisplayStatInfo;

class DisplayStatInfo;

class IDisplayEventConnection;

class IDisplayEventConnection;

class IMemoryHeap;

class IMemoryHeap;

services/surfaceflinger/DisplayDevice.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ struct ANativeWindow; 




namespace android {

namespace android {





class DisplayInfo;

struct DisplayInfo;

class DisplaySurface;

class DisplaySurface;

class IGraphicBufferProducer;

class IGraphicBufferProducer;

class Layer;

class Layer;

services/surfaceflinger/DisplayHardware/HWComposer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ public: 
     * This behaves more or less like a forward iterator.

     * This behaves more or less like a forward iterator.

     */

     */

    class LayerListIterator {

    class LayerListIterator {

        friend struct HWComposer;

        friend class HWComposer;

        HWCLayer* const mLayerList;

        HWCLayer* const mLayerList;

        size_t mIndex;

        size_t mIndex;