commit 0daf872712502000ba1a3e7050468ab5446b6f00
author Pablo Ceballos <pceballos@google.com> Mon Mar 28 21:01:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 28 21:01:03 2016 +0000
tree fac56bc75ec2a33d40e04089e4c31a83ac2df805
parent ecda1ed1d3d5ba48cd7a9a88170f8784f0636b19
parent 0e28c1fa4a759755f21bf8a10d9e645ae64d1f78

Merge "Rename single buffer mode to shared buffer mode" into nyc-dev
am: 0e28c1f

* commit '0e28c1fa4a759755f21bf8a10d9e645ae64d1f78':
  Rename single buffer mode to shared buffer mode

include/system/window.h

diff --git a/include/system/window.h b/include/system/window.h
index 1ca093f..b8f33ff 100644
--- a/include/system/window.h
+++ b/include/system/window.h
@@ -312,7 +312,7 @@
     NATIVE_WINDOW_SET_SIDEBAND_STREAM       = 18,
     NATIVE_WINDOW_SET_BUFFERS_DATASPACE     = 19,
     NATIVE_WINDOW_SET_SURFACE_DAMAGE        = 20,   /* private */
-    NATIVE_WINDOW_SET_SINGLE_BUFFER_MODE    = 21,
+    NATIVE_WINDOW_SET_SHARED_BUFFER_MODE    = 21,
     NATIVE_WINDOW_SET_AUTO_REFRESH          = 22,
 };
 
@@ -954,20 +954,20 @@
 }
 
 /*
- * native_window_set_single_buffer_mode(..., bool singleBufferMode)
- * Enable/disable single buffer mode
+ * native_window_set_shared_buffer_mode(..., bool sharedBufferMode)
+ * Enable/disable shared buffer mode
  */
-static inline int native_window_set_single_buffer_mode(
+static inline int native_window_set_shared_buffer_mode(
         struct ANativeWindow* window,
-        bool singleBufferMode)
+        bool sharedBufferMode)
 {
-    return window->perform(window, NATIVE_WINDOW_SET_SINGLE_BUFFER_MODE,
-            singleBufferMode);
+    return window->perform(window, NATIVE_WINDOW_SET_SHARED_BUFFER_MODE,
+            sharedBufferMode);
 }
 
 /*
  * native_window_set_auto_refresh(..., autoRefresh)
- * Enable/disable auto refresh when in single buffer mode
+ * Enable/disable auto refresh when in shared buffer mode
  */
 static inline int native_window_set_auto_refresh(
         struct ANativeWindow* window,