commit 46a4fbb2e497d13a9a93f67beef68c047005c247
author Sergey Prigogin <sprigogin@google.com> Mon May 08 20:44:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 08 20:44:12 2017 +0000
tree b0809c580d329dcd5de7f809ee61d4a08044eb8d
parent 52bc790f616f3f1578f31e7161eb93f670213bdb
parent d0e462e3cd6ec64c1d7267f9dbf36c5e7503a693

Merge "Fix a NPE with outlineProvider="none""

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

diff --git a/tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java b/tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java
index 23caaf8..4b760a7 100644
--- a/tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java
@@ -50,12 +50,14 @@
             // the outline obtained is correct.
             child.setBackgroundBounds();
             ViewOutlineProvider outlineProvider = child.getOutlineProvider();
-            Outline outline = child.mAttachInfo.mTmpOutline;
-            outlineProvider.getOutline(child, outline);
-            if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) {
-                int restoreTo = transformCanvas(thisVG, canvas, child);
-                drawShadow(thisVG, canvas, child, outline);
-                canvas.restoreToCount(restoreTo);
+            if (outlineProvider != null) {
+                Outline outline = child.mAttachInfo.mTmpOutline;
+                outlineProvider.getOutline(child, outline);
+                if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) {
+                    int restoreTo = transformCanvas(thisVG, canvas, child);
+                    drawShadow(thisVG, canvas, child, outline);
+                    canvas.restoreToCount(restoreTo);
+                }
             }
         }
         return thisVG.drawChild_Original(canvas, child, drawingTime);