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

Commit f47c93b7 authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android (Google) Code Review
Browse files

Merge "integrate videoeditor preview player." into honeycomb

parents 6449492f b6783164

include/surfaceflinger/Surface.h

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ private: 
    friend class MediaPlayer;

    // for testing

    friend class Test;

    // videoEditor preview classes

    friend class VideoEditorPreviewController;



    const sp<ISurface>& getISurface() const { return mSurface; }
@@ -181,6 +184,9 @@ private: 
    friend class SoftwareRenderer;

    // this is just to be able to write some unit tests

    friend class Test;

    // videoEditor preview classes

    friend class VideoEditorPreviewController;

    friend class PreviewRenderer;



private:

    friend class SurfaceComposerClient;