Merge "integrate videoeditor preview player." into honeycomb

1 files changed, 6 insertions, 0 deletions

diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h
index 5532052864..d783caff2a 100644
--- a/include/surfaceflinger/Surface.h
+++ b/include/surfaceflinger/Surface.h
@@ -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;