diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h
index fa3b7a0dc78d8..0398ea7eb7c17 100644
--- a/include/ui/egl/android_natives.h
+++ b/include/ui/egl/android_natives.h
@@ -41,12 +41,6 @@ extern "C" {
 
 struct android_native_buffer_t;
 
-enum {
-    /* attributes of this surface or its updater */
-    SURFACE_FLAG_PRESERVE_CONTENT   = FRAMEBUFFER_RESERVED0,
-    SURFACE_FLAG_MAPPED             = FRAMEBUFFER_FLAG_MAPPED,
-};
-
 // ---------------------------------------------------------------------------
 
 struct android_native_base_t
@@ -64,6 +58,7 @@ struct android_native_base_t
     void (*decRef)(struct android_native_base_t* base);
 };
 
+// ---------------------------------------------------------------------------
 
 struct android_native_window_t 
 {
@@ -138,6 +133,7 @@ struct android_native_window_t
     void* reserved_proc[5];
 };
 
+// ---------------------------------------------------------------------------
 
 /* FIXME: this is legacy for pixmaps */
 struct egl_native_pixmap_t
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp
index 4e692e2c27a19..83b333f7e0e1e 100644
--- a/libs/ui/FramebufferNativeWindow.cpp
+++ b/libs/ui/FramebufferNativeWindow.cpp
@@ -110,28 +110,7 @@ FramebufferNativeWindow::FramebufferNativeWindow()
                 fbDev->width, fbDev->height, strerror(-err));
     }
 
-    uint32_t flags = fbDev->flags & SURFACE_FLAG_MAPPED;
-    
-    /*
-     * FIXME: SURFACE_FLAG_PRESERVE_CONTENT
-     * how to implement this, there is no concept of preserve content in
-     * the framebuffer, which just "posts" buffer.
-     * 
-     * It looks like what we need is a way to know if the posted buffer can
-     * be reused. But if so, why allocating 2 buffers?...
-     * 
-     * should the lock/unlock calls take care of the copy-back?
-     * 
-     * 
-     * In the end, the client wants to know if the backbuffer is preserved
-     * though... it's complicated.
-     * 
-     */
-    
-    //flags |= SURFACE_FLAG_PRESERVE_CONTENT;
-    
-
-    const_cast<uint32_t&>(android_native_window_t::flags) = flags; 
+    const_cast<uint32_t&>(android_native_window_t::flags) = fbDev->flags; 
     const_cast<float&>(android_native_window_t::xdpi) = fbDev->xdpi;
     const_cast<float&>(android_native_window_t::ydpi) = fbDev->ydpi;
     const_cast<int&>(android_native_window_t::minSwapInterval) =