summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2011-12-14 16:13:09 +0530
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-12-17 11:57:27 +0059
commitb07d48ec3a4342e7355071ddfbc61a28a03d0358 (patch)
tree6745e9711e8f3659845a7ec90029fc4869609458
parent08b40feb11ae7c63fd2f144614ea044fed16fe85 (diff)
downloadbase-b07d48ec3a4342e7355071ddfbc61a28a03d0358.tar.gz
Revert "frameworks/base: Disable hardware rendering for now"
This reverts commit 4abc51753c40d39701beae07a658ef0364c0c245.
-rw-r--r--core/java/android/app/ActivityManager.java6
-rw-r--r--core/java/android/view/HardwareRenderer.java6
2 files changed, 3 insertions, 9 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 6d142fb1cd6f..4fe9cef2b7c2 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -216,9 +216,7 @@ public class ActivityManager {
* @hide
*/
static public boolean isHighEndGfx(Display display) {
- //TODO RETURN FALSE TO AVOID OPENGL
- /*
- MemInfoReader reader = new MemInfoReader();
+ MemInfoReader reader = new MemInfoReader();
reader.readMemInfo();
if (reader.getTotalSize() >= (512*1024*1024)) {
// If the device has at least 512MB RAM available to the kernel,
@@ -232,7 +230,7 @@ public class ActivityManager {
// If this is a sufficiently large screen, then there are enough
// pixels on it that we'd really like to use hw drawing.
return true;
- }*/
+ }
return false;
}
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index 3380599d9ebc..ccb64895703c 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -103,17 +103,13 @@ public abstract class HardwareRenderer {
*
* @hide
*/
- //public static boolean sRendererDisabled = false;
- //TODO FIX ITWHEN HW RENDERING IS POSSIBLE
- public static boolean sRendererDisabled = true;
+ public static boolean sRendererDisabled = false;
/**
* Further hardware renderer disabling for the system process.
*
* @hide
*/
- //public static boolean sSystemRendererDisabled = false;
- //TODO FIX ITWHEN HW RENDERING IS POSSIBLE
public static boolean sSystemRendererDisabled = false;
private boolean mEnabled;