diff options
| author | Chris Craik <ccraik@google.com> | 2013-04-25 15:32:40 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2013-04-25 15:32:40 -0700 |
| commit | eaddac6d2662f4443561a75b355c472c751ef6fc (patch) | |
| tree | d555f0fde356b218b5cd51f8f5720f5f343f62ea /core/java/android/view/View.java | |
| parent | d9ecfa0037105e8c6662091af6f8936f3ae627b8 (diff) | |
| download | frameworks_base-eaddac6d2662f4443561a75b355c472c751ef6fc.zip frameworks_base-eaddac6d2662f4443561a75b355c472c751ef6fc.tar.gz frameworks_base-eaddac6d2662f4443561a75b355c472c751ef6fc.tar.bz2 | |
Force clipping on layers that fail to be allocated
bug:8666842
In SW rendering, a previous optimization avoided clipping to the
bounds of views that are layers. This breaks if the view fails to
create a layer (such as if it's too big), so instead look at whether
the view has a layer.
Change-Id: I653882035512012aefd91f06ff0bdc73aa5e4430
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 11e392d..b5aa18f 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13785,7 +13785,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } if ((flags & ViewGroup.FLAG_CLIP_CHILDREN) == ViewGroup.FLAG_CLIP_CHILDREN && - !useDisplayListProperties && layerType == LAYER_TYPE_NONE) { + !useDisplayListProperties && cache == null) { if (offsetForScroll) { canvas.clipRect(sx, sy, sx + (mRight - mLeft), sy + (mBottom - mTop)); } else { |