Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59812895 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Don't set hwAccelerated=true when libhwui is not present."

parents a655c635 53ca03d9

core/java/android/view/HardwareRenderer.java

+3 −3
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ public abstract class HardwareRenderer { 
    abstract void draw(View view, View.AttachInfo attachInfo, int yOffset);



    /**

     * Creates a new canvas that can be used to record drawing operations

     * in the specified display list.

     * Creates a new display list that can be used to record batches of

     * drawing operations.

     * 

     * @return A new recording canvas.

     * @return A new display list.

     */

    abstract DisplayList createDisplayList();

core/java/android/view/ViewRoot.java

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn 
                    mAttachInfo.mHardwareRenderer.destroy(true);

                }                

                mAttachInfo.mHardwareRenderer = HardwareRenderer.createGlRenderer(2, translucent);

                mAttachInfo.mHardwareAccelerated = true;

                mAttachInfo.mHardwareAccelerated = mAttachInfo.mHardwareRenderer != null;

            }

        }

    }