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

Commit 3d33f5cf authored by Sergey Prigogin's avatar Sergey Prigogin Committed by android-build-merger
Browse files

Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2 am: 65d65ec1 

am: a3460f2b

Change-Id: Iccb6dc6a7758abffe2d25bcc8b5dfbb1f600b05c
parents a28ca7e0 a3460f2b

tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java

+8 −6
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class ViewGroup_Delegate { 
            // the outline obtained is correct.

            child.setBackgroundBounds();

            ViewOutlineProvider outlineProvider = child.getOutlineProvider();

            if (outlineProvider != null) {

                Outline outline = child.mAttachInfo.mTmpOutline;

                outlineProvider.getOutline(child, outline);

                if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) {
@@ -58,6 +59,7 @@ public class ViewGroup_Delegate { 
                    canvas.restoreToCount(restoreTo);

                }

            }

        }

        return thisVG.drawChild_Original(canvas, child, drawingTime);

    }