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

Commit 167c5b76 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Fix drawing cache on sw drawing" into nyc-dev 

am: 8f81637a

* commit '8f81637a':
  Fix drawing cache on sw drawing
parents 2924c464 8f81637a

core/java/android/view/View.java

+6 −5
Original line number Diff line number Diff line
@@ -16582,11 +16582,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        RenderNode renderNode = null;

        Bitmap cache = null;

        int layerType = getLayerType(); // TODO: signify cache state with just 'cache' local

        if (layerType == LAYER_TYPE_SOFTWARE

                || (!drawingWithRenderNode && layerType != LAYER_TYPE_NONE)) {

        if (layerType == LAYER_TYPE_SOFTWARE || !drawingWithRenderNode) {

             if (layerType != LAYER_TYPE_NONE) {

                 // If not drawing with RenderNode, treat HW layers as SW

                 layerType = LAYER_TYPE_SOFTWARE;

                 buildDrawingCache(true);

            }

            cache = getDrawingCache(true);

        }