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

Commit 6d6ce03a authored by John Reck's avatar John Reck
Browse files

resolved conflicts for merge of 313c5f38 to master 

Conflicts:
	core/java/android/view/HardwareRenderer.java

Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd
parents 8974f249 313c5f38

core/java/android/view/GLRenderer.java

+0 −4
Original line number Diff line number Diff line
@@ -1220,10 +1220,6 @@ public class GLRenderer extends HardwareRenderer { 
    }



    private RenderNode buildDisplayList(View view, HardwareCanvas canvas) {

        if (mDrawDelta <= 0) {

            return view.mRenderNode;

        }



        view.mRecreateDisplayList = (view.mPrivateFlags & View.PFLAG_INVALIDATED)

                == View.PFLAG_INVALIDATED;

        view.mPrivateFlags &= ~View.PFLAG_INVALIDATED;