diff options
| author | John Reck <jreck@google.com> | 2014-04-02 18:03:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-02 18:03:49 +0000 |
| commit | a8b937115ac3bf047c8fc6c750f052fd633c5dd8 (patch) | |
| tree | 1af36fbf497fcaa8dc2b3cc7d26dc535d97f1985 /core/java/android | |
| parent | 892c574ecca0cd5bfc2444bbb6ca7204a296de3c (diff) | |
| parent | dd58e797aa453f468232c6a5949a37e4691f309e (diff) | |
| download | frameworks_base-a8b937115ac3bf047c8fc6c750f052fd633c5dd8.zip frameworks_base-a8b937115ac3bf047c8fc6c750f052fd633c5dd8.tar.gz frameworks_base-a8b937115ac3bf047c8fc6c750f052fd633c5dd8.tar.bz2 | |
Merge "Revert "Force-enable hardware acceleration for apps""
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index b617f68..a35c28e 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -678,13 +678,13 @@ public final class ViewRootImpl implements ViewParent, mAttachInfo.mHardwareAccelerationRequested = false; // Don't enable hardware acceleration when the application is in compatibility mode - if (false && mTranslator != null) return; + if (mTranslator != null) return; // Try to enable hardware acceleration if requested final boolean hardwareAccelerated = (attrs.flags & WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0; - if (true || hardwareAccelerated) { + if (hardwareAccelerated) { if (!HardwareRenderer.isAvailable()) { return; } |
