commit 68612bae68be0986116dd588185267a410fb784a
author Brian Carlstrom <bdc@google.com> Tue Mar 02 16:56:59 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 02 16:56:59 2010 -0800
tree 154e51ec8b4128443dae15b2f4e7f18a67e8f77c
parent 6b1806b2d3dac4ac11c4c5d306320fcabf5fac1e
parent a5987a510187749c32f0f68f8fc54e1334f91be6

Merge "SslCertificate should clone Dates"

core/jni/android_database_SQLiteDatabase.cpp

diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp
index 0bee8c0..b93311b 100644
--- a/core/jni/android_database_SQLiteDatabase.cpp
+++ b/core/jni/android_database_SQLiteDatabase.cpp
@@ -75,11 +75,11 @@
     }
 
     LOGV("Registering sqlite logging func \n");
-    //int err = sqlite3_config(SQLITE_CONFIG_LOG, &sqlLogger, 0);
-    //if (err != SQLITE_OK) {
-        //LOGE("sqlite_config failed error_code = %d. THIS SHOULD NEVER occur.\n", err);
-        //#return;
-    //}
+    int err = sqlite3_config(SQLITE_CONFIG_LOG, &sqlLogger, 0);
+    if (err != SQLITE_OK) {
+        LOGE("sqlite_config failed error_code = %d. THIS SHOULD NEVER occur.\n", err);
+        return;
+    }
     loggingFuncSet = true;
 }
 

libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp

diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
index d9d9bfe..5969617 100644
--- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
@@ -246,10 +246,15 @@
     LOGI("version   : %s", glGetString(GL_VERSION));
     LOGI("extensions: %s", gl_extensions);
 
-    if (strstr(gl_renderer, "Adreno")) {
+#if 0
+    // for drivers that don't have proper support for flushing cached buffers
+    // on gralloc unlock, uncomment this block and test for the specific
+    // renderer substring
+    if (strstr(gl_renderer, "<some vendor string>")) {
         LOGD("Assuming uncached graphics buffers.");
         mFlags &= ~CACHED_BUFFERS;
     }
+#endif
 
     if (strstr(gl_extensions, "GL_ARB_texture_non_power_of_two")) {
         mFlags |= NPOT_EXTENSION;