diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2011-12-15 06:19:31 -0800 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-12-17 22:00:41 +0059 |
| commit | b5d218f26e9404cfdf54a91f8063bb70bcb934da (patch) | |
| tree | 37173b3b42c3f64b36c453f38f1ee6119e6b5856 | |
| parent | becb01e26687718f64214c3a632b50f97c39a6f1 (diff) | |
| download | base-b5d218f26e9404cfdf54a91f8063bb70bcb934da.tar.gz | |
Revert "frameworks/base: Disable hardware rendering for now"
This reverts commit 4abc51753c40d39701beae07a658ef0364c0c245.
Change-Id: I4fdd1edd107d6dc97933ffce3b97431d8f12613d
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 6 |
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; |