Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergey Prigogin
2017-05-08 20:44:11 +00:00
committed by Gerrit Code Review
parent 52bc790f61 d0e462e3cd
commit 46a4fbb2e4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java
View File

@@ -50,12 +50,14 @@ public class ViewGroup_Delegate {
// the outline obtained is correct. // the outline obtained is correct.
child.setBackgroundBounds(); child.setBackgroundBounds();
ViewOutlineProvider outlineProvider = child.getOutlineProvider(); ViewOutlineProvider outlineProvider = child.getOutlineProvider();
Outline outline = child.mAttachInfo.mTmpOutline; if (outlineProvider != null) {
outlineProvider.getOutline(child, outline); Outline outline = child.mAttachInfo.mTmpOutline;
if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) { outlineProvider.getOutline(child, outline);
int restoreTo = transformCanvas(thisVG, canvas, child); if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) {
drawShadow(thisVG, canvas, child, outline); int restoreTo = transformCanvas(thisVG, canvas, child);
canvas.restoreToCount(restoreTo); drawShadow(thisVG, canvas, child, outline);
canvas.restoreToCount(restoreTo);
}
} }
} }
return thisVG.drawChild_Original(canvas, child, drawingTime); return thisVG.drawChild_Original(canvas, child, drawingTime);