Merge change I7d40ad9a into eclair
* changes:
More on issue #2271640: Fix wallpaper etc docs
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index d77d702..3a23b49 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -84,6 +84,8 @@
EXEC("dmesg");
PRINT("------ KERNEL WAKELOCKS ------");
DUMP("/proc/wakelocks");
+ PRINT("------ KERNEL CPUFREQ ------");
+ DUMP("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
PRINT("");
PRINT("------ PROCESSES ------");
EXEC1("ps", "-P");
diff --git a/libs/surfaceflinger/LayerBlur.cpp b/libs/surfaceflinger/LayerBlur.cpp
index 5d4a38b..5fd7904 100644
--- a/libs/surfaceflinger/LayerBlur.cpp
+++ b/libs/surfaceflinger/LayerBlur.cpp
@@ -169,7 +169,6 @@
// This reads the frame-buffer, so a h/w GL would have to
// finish() its rendering first. we don't want to do that
// too often. Read data is 4-bytes aligned.
- glFinish();
glReadPixels(X, Y, w, h, mReadFormat, mReadType, pixels);
// blur that texture.