commit f3b6793f8e9aec359ab78aa516343d7d9c2c645b
author Android (Google) Code Review <android-gerrit@google.com> Sun Nov 15 05:32:03 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sun Nov 15 05:32:03 2009 -0800
tree 4040c48baba616d610e8899f05ab2592a432b3b1
parent 7b563c23dcdc22028128d42d81d5f93250e543ce
parent ed83aa2fc713527cdcfa0da07cf98b4716546e82

Merge changes Ia4825f54,If6f80560 into eclair

* changes:
  Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
  PowerManagerService: Hold a wakelock while mProximityTask is queued

libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp

diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
index 1abfd68..79c003f 100644
--- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
@@ -246,10 +246,12 @@
     LOGI("version   : %s", glGetString(GL_VERSION));
     LOGI("extensions: %s", gl_extensions);
 
-    if (strstr(gl_renderer, "PowerVR SGX 530")) {
+    if (strstr(gl_renderer, "PowerVR SGX 530") ||
+        strstr(gl_renderer, "Adreno")) {
         LOGD("Assuming uncached graphics buffers.");
         mFlags &= ~CACHED_BUFFERS;
     }
+
     if (strstr(gl_extensions, "GL_ARB_texture_non_power_of_two")) {
         mFlags |= NPOT_EXTENSION;
     }