commit c6d6863c9b0177096d355035d7609ca8c8e4799c
author Jeff Brown <jeffbrown@android.com> Wed Aug 10 13:42:03 2011 -0700
committer Android Code Review <code-review@android.com> Wed Aug 10 13:42:03 2011 -0700
tree 4d11ce33a0a5f31a51e7185e089b856aae6f52cc
parent 091c0f7ece244bad1cd3bd2bbf525b1436511089
parent 5aa3d79025c6565ee274945a032a269fc86db85f

Merge "Fix getSwitchState according to device capabilities."

cmds/runtime/main_runtime.cpp

diff --git a/cmds/runtime/main_runtime.cpp b/cmds/runtime/main_runtime.cpp
index 83cb533..76155fd 100644
--- a/cmds/runtime/main_runtime.cpp
+++ b/cmds/runtime/main_runtime.cpp
@@ -497,8 +497,8 @@
     } else {
 #ifndef HAVE_ANDROID_OS
         QuickRuntime* runt = new QuickRuntime();
-        runt->start("com/android/server/SystemServer", 
-                    false /* spontaneously fork system server from zygote */);
+        runt->start("com/android/server/SystemServer",
+                    "" /* spontaneously fork system server from zygote */);
 #endif
     }
 

include/gui/SurfaceTexture.h

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 5a9e86f..ec62b96 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -22,7 +22,7 @@
 struct SurfaceTexture {
     struct FrameAvailableListener : public virtual RefBase {};
 
-    SurfaceTexture(GLuint) {}
+    SurfaceTexture(GLuint, bool allowSynchronousMode = true) {}
     void updateTexImage() {}
     void decStrong(android::sp<android::SurfaceTexture>* const) {}
     void incStrong(android::sp<android::SurfaceTexture>* const) {}
@@ -30,6 +30,7 @@
     void setFrameAvailableListener(const sp<FrameAvailableListener>&) {}
     void setSynchronousMode(bool) {}
     GLenum getCurrentTextureTarget() const { return 0; }
+    void setBufferCount(int bufferCount) {}
 };
 
 static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)