diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 05a9ff8b5831..f9a6c1b58c3f 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -36,7 +36,7 @@ import javax.microedition.khronos.opengles.GL; * @hide */ public abstract class HardwareRenderer { - private static final String LOG_TAG = "HardwareRenderer"; + static final String LOG_TAG = "HardwareRenderer"; /** * A process can set this flag to false to prevent the use of hardware diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 7c55f7b328c8..d480bbc5e300 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -485,7 +485,14 @@ public final class ViewRoot extends Handler implements ViewParent, private void enableHardwareAcceleration(WindowManager.LayoutParams attrs) { mAttachInfo.mHardwareAccelerated = false; mAttachInfo.mHardwareAccelerationRequested = false; - + + // Don't enable hardware acceleration when we're not on the main thread + if (Looper.getMainLooper() != Looper.myLooper()) { + Log.w(HardwareRenderer.LOG_TAG, "Attempting to initialize hardware acceleration " + + "outside of the main thread, aborting"); + return; + } + // Try to enable hardware acceleration if requested if (attrs != null && (attrs.flags & WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0) { |