commit d0e462e3cd6ec64c1d7267f9dbf36c5e7503a693
author Sergey Prigogin <sprigogin@google.com> Tue Apr 25 16:29:44 2017 -0700
committer Sergey Prigogin <sprigogin@google.com> Tue Apr 25 16:34:40 2017 -0700
tree decfa256117ed9434e4e153ecc05a1f6defdd231
parent 4c4a55a67b5e7a2ea11715db42f15f25c4f132db

Fix a NPE with outlineProvider="none"

Do not attempt to draw outline when outline provider is null.

Test: manually follow the steps in https://b.corp.google.com/issues/37139123#comment1
Bug: https://issuetracker.google.com/37139123

Change-Id: I6e09c187d5a8e1364e2ecbe12bbb5a17ad057965
Signed-off-by: Sergey Prigogin <sprigogin@google.com>

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);